Skip to content

Commit 4933910

Browse files
committed
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 <[email protected]>
1 parent 8e91927 commit 4933910

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

builtin/mailinfo.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -654,8 +654,7 @@ static int is_scissors_line(const struct strbuf *line)
654654

655655
static int handle_commit_msg(struct mailinfo *mi, struct strbuf *line)
656656
{
657-
if (!mi->cmitmsg)
658-
return 0;
657+
assert(!mi->filter_stage);
659658

660659
if (mi->header_stage) {
661660
if (!line->len || (line->len == 1 && line->buf[0] == '\n'))

0 commit comments

Comments
 (0)