From: Junio C Hamano Date: Wed, 14 Oct 2015 20:45:45 GMT Subject: [PATCH v2 19/31] mailinfo: handle_commit_msg() shouldn't be called after finding patchbreak Message-ID: <1444855557-2127-20-git-send-email-gitster@pobox.com> In-Reply-To: <1444855557-2127-1-git-send-email-gitster@pobox.com> There is a strange "if (!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). Signed-off-by: Junio C Hamano --- builtin/mailinfo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c index 41f659d..f48a260 100644 --- a/builtin/mailinfo.c +++ b/builtin/mailinfo.c @@ -724,8 +724,7 @@ static int is_scissors_line(const struct strbuf *line) static int handle_commit_msg(struct mailinfo *mi, struct strbuf *line) { - if (!cmitmsg) - return 0; + assert(!mi->filter_stage); if (mi->header_stage) { if (!line->len || (line->len == 1 && line->buf[0] == '\n')) -- 2.6.1-320-g86a1181