diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-06 23:06:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-06 23:17:26 -0800 |
| commit | e5138436ddd4b5f75c1e910f6b844e4fcf91343d (patch) | |
| tree | 59975bc8e3cb2fca73c02cbe179f09986cbca554 /builtin-commit.c | |
| parent | c1e01b0c5106451770ae77a62f52acfe814c3326 (diff) | |
| download | git-e5138436ddd4b5f75c1e910f6b844e4fcf91343d.tar.gz git-e5138436ddd4b5f75c1e910f6b844e4fcf91343d.tar.xz | |
builtin-commit.c: fix logic to omit empty line before existing footers
"commit -s" used to add an empty line before adding S-o-b line only when
the last line of the existing log message is not another S-o-b line, but
c1e01b0 (commit: More generous accepting of RFC-2822 footer lines.,
2009-10-28) introduced logic to omit this empty line when the message ends
with a run of "footer" lines, to cover S-o-b's friends, e.g. Acked-by.
However, the logic was overzealous and missed one corner case. A message
that consists of a single line that begins with Token + colon, it can be
mistaken as a S-o-b's friend. We do want an empty line in such a case.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index c395cbf14..cfa6b06e9 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -530,7 +530,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--) ; /* do nothing */ if (prefixcmp(sb.buf + i, sob.buf)) { - if (!ends_rfc2822_footer(&sb)) + if (!i || !ends_rfc2822_footer(&sb)) strbuf_addch(&sb, '\n'); strbuf_addbuf(&sb, &sob); } |