From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Apr 2008 18:01:36 +0000 (-0700)
Subject: Ignore leading empty lines while summarizing merges
X-Git-Tag: v1.5.5.1~7^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6a28518ae098fad99ca3774ad7ed17bb681b809b
Ignore leading empty lines while summarizing merges
"git log" and friends normally skip the initial empty lines when showing
one-line summary of a commit, but merge summary didn't.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
builtin-fmt-merge-msg.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index 6163bd4975..03c2bc33eb 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -200,6 +200,15 @@ static void shortlog(const char *name, unsigned char *sha1,
continue;
bol = strstr(commit->buffer, "\n\n");
+ if (bol) {
+ unsigned char c;
+ do {
+ c = *++bol;
+ } while (isspace(c));
+ if (!c)
+ bol = NULL;
+ }
+
if (!bol) {
append_to_list(&subjects, xstrdup(sha1_to_hex(
commit->object.sha1)),
@@ -207,7 +216,6 @@ static void shortlog(const char *name, unsigned char *sha1,
continue;
}
- bol += 2;
eol = strchr(bol, '\n');
if (eol) {
oneline = xmemdupz(bol, eol - bol);