mailinfo: handle_commit_msg() shouldn't be called after finding patchbreak
There is a strange "if (!mi->cmitmsg) return 0" at the very beginning of handle_commit_msg(), but the condition should never trigger, because: * The only place cmitmsg is set to NULL is after this function sees a patch break, closes the FILE * to write the commit log message and returns 1. This function returns non-zero only from that codepath. * The caller of this function, upon seeing a non-zero return, increments filter_stage, starts treating the input as patch text and will never call handle_commit_msg() again. Replace it with an assert(!mi->filter_stage) to ensure the above observation will stay to be true. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Oct 14, 2015 at 16:16 UTC
4933910ab7a74ebcf13342726d7f055ee35a8f7c
1 file changed
+1
-2
builtin/mailinfo.c
+1
-2
@@ -654,8 +654,7 @@ static int is_scissors_line(const struct strbuf *line)
654
655
static int handle_commit_msg(struct mailinfo *mi, struct strbuf *line)
656
{
657
- if (!mi->cmitmsg)
658
- return 0;
657
+ assert(!mi->filter_stage);
658
659
if (mi->header_stage) {
660
if (!line->len || (line->len == 1 && line->buf[0] == '\n'))