author | Junio C Hamano <gitster@pobox.com> | |
Sat, 7 Nov 2009 07:06:06 +0000 (23:06 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 7 Nov 2009 07:17:26 +0000 (23:17 -0800) | ||
commit | e5138436ddd4b5f75c1e910f6b844e4fcf91343d | |
tree | 59975bc8e3cb2fca73c02cbe179f09986cbca554 | tree | snapshot |
parent | c1e01b0c5106451770ae77a62f52acfe814c3326 | commit | diff |
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>
"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>
builtin-commit.c | diff | blob | history | |
t/t7502-commit.sh | diff | blob | history |