[PATCH v3 02/11] commit, cherry-pick -s: remove broken support for multiline rfc2822 fields
- From
Brandon Casey <drafnel@gmail.com>
- Date
- Jan 28, 2013, 01:11 UTC
- Message-ID
- <1359335515-13818-3-git-send-email-drafnel@gmail.com>
- In-Reply-To
- <1359335515-13818-1-git-send-email-drafnel@gmail.com>
Starting with c1e01b0c (commit: More generous accepting of RFC-2822 footer lines, 2009-10-28), "git commit -s" carefully parses the last paragraph of each commit message to check if it consists only of RFC2822-style headers, in which case the signoff will be added as a new line in the same list:
Reported-by: Reporter <reporter@example.com> Signed-off-by: Author <author@example.com> Acked-by: Lieutenant <lt@example.com>
It even included support for accepting indented continuation lines for multiline fields. Unfortunately the multiline field support is broken because it checks whether buf[k] (the first character of the *next* line) instead of buf[i] is a whitespace character. The result is that any footer with a continuation line is not accepted, since the last continuation line neither starts with an RFC2822 field name nor is followed by a continuation line.
That this has remained broken for so long is good evidence that nobody actually needed multiline fields. Rip out the broken continuation support.
There should be no functional change.
[Thanks to Jonathan Nieder for the excellent commit message]
Signed-off-by: Brandon Casey <bcasey@nvidia.com> --- sequencer.c | 6 ------ 1 file changed, 6 deletions(-)
diff --git a/sequencer.c b/sequencer.c index cd211b2..39a752b 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1027,7 +1027,6 @@ static int ends_rfc2822_footer(struct strbuf *sb, int ignore_footer) int last_char_was_nl, this_char_is_nl; int i, j, k; int len = sb->len - ignore_footer; - int first = 1; const char *buf = sb->buf; /* find start of last paragraph */ @@ -1047,11 +1046,6 @@ static int ends_rfc2822_footer(struct strbuf *sb, int ignore_footer) ; /* do nothing */ k++; - if ((buf[k] == ' ' || buf[k] == '\t') && !first) - continue; - - first = 0; - for (j = 0; i + j < len; j++) { ch = buf[i + j]; if (ch == ':')
-- 1.8.1.1.450.g0327af3