From 40c2fe003ce2af3ec522f239be274fd1a27422f6 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 14 Apr 2006 21:20:51 -0700 Subject: [PATCH] Clean up trailing whitespace when pretty-printing commits Partly because we've messed up and now have some commits with trailing whitespace, but partly because this also just simplifies the code, let's remove trailing whitespace from the end when pretty-printing commits. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- commit.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/commit.c b/commit.c index c7bb8dba..ca255745 100644 --- a/commit.c +++ b/commit.c @@ -557,16 +557,11 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit if (fmt == CMIT_FMT_ONELINE) break; } - if (fmt == CMIT_FMT_ONELINE) { - /* We do not want the terminating newline */ - if (buf[offset - 1] == '\n') - offset--; - } - else { - /* Make sure there is an EOLN */ - if (buf[offset - 1] != '\n') - buf[offset++] = '\n'; - } + while (offset && isspace(buf[offset-1])) + offset--; + /* Make sure there is an EOLN for the non-oneline case */ + if (fmt != CMIT_FMT_ONELINE) + buf[offset++] = '\n'; buf[offset] = '\0'; return offset; } -- 2.11.0