diff options
| author | Brandon Casey <drafnel@gmail.com> | 2013-02-12 02:17:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-12 11:14:33 -0800 |
| commit | 2cdccad1600171e3c53e2e9c22e1675389a9d61a (patch) | |
| tree | 84d847e9571f2ebb478d7e3d3688fb0aadd8001f /sequencer.c | |
| parent | cd650a4eee148dadb0943f415e88c210f18e70df (diff) | |
| download | git-2cdccad1600171e3c53e2e9c22e1675389a9d61a.tar.gz | |
sequencer.c: require a conforming footer to be preceded by a blank line
Currently, append_signoff() performs a search for the last line of the
commit buffer by searching back from the end until it hits a newline. If
it reaches the beginning of the buffer without finding a newline, that
means either the commit message was empty, or there was only one line in it.
In this case, append_signoff will skip the call to has_conforming_footer
since it already knows that it is necessary to append a newline before
appending the sob.
Let's perform this function inside of has_conforming_footer where it
appropriately belongs and generalize it so that we require that the
footer paragraph be an actual distinct paragraph separated by a blank
line.
Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 7889b6bc19..5a9c43d806 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1061,6 +1061,10 @@ static int has_conforming_footer(struct strbuf *sb, int ignore_footer) prev = ch; } + /* require at least one blank line */ + if (prev != '\n' || buf[i] != '\n') + return 0; + /* advance to start of last paragraph */ while (i < len - 1 && buf[i] == '\n') i++; @@ -1089,7 +1093,7 @@ void append_signoff(struct strbuf *msgbuf, int ignore_footer) for (i = msgbuf->len - 1 - ignore_footer; i > 0 && msgbuf->buf[i - 1] != '\n'; i--) ; /* do nothing */ if (prefixcmp(msgbuf->buf + i, sob.buf)) { - if (!i || !has_conforming_footer(msgbuf, ignore_footer)) + if (!has_conforming_footer(msgbuf, ignore_footer)) strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0, "\n", 1); strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0, sob.buf, sob.len); } |