From: Junio C Hamano Date: Fri, 10 Nov 2006 21:39:01 +0000 (-0800) Subject: git-annotate: fix -S on graft file with comments. X-Git-Tag: v1.4.4-rc2~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8eaf79869f9eddf50ddffffb8d73a054e0514fcd git-annotate: fix -S on graft file with comments. The graft file can contain comment lines and read_graft_line can return NULL for such an input, which should be skipped by the reader. Signed-off-by: Junio C Hamano --- diff --git a/builtin-blame.c b/builtin-blame.c index 16660221c3..066dee743e 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -1407,7 +1407,8 @@ static int read_ancestry(const char *graft_file) /* The format is just "Commit Parent1 Parent2 ...\n" */ int len = strlen(buf); struct commit_graft *graft = read_graft_line(buf, len); - register_commit_graft(graft, 0); + if (graft) + register_commit_graft(graft, 0); } fclose(fp); return 0;