diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-10 13:39:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-10 13:44:39 -0800 |
| commit | 8eaf79869f9eddf50ddffffb8d73a054e0514fcd (patch) | |
| tree | 41a85f19c2f32c2a9820663dd04e2e432837c739 /builtin-blame.c | |
| parent | a19f901d9f07b07abd2bfbad62037b9783fcaa7c (diff) | |
| download | git-8eaf79869f9eddf50ddffffb8d73a054e0514fcd.tar.gz | |
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 <junkio@cox.net>
Diffstat (limited to 'builtin-blame.c')
| -rw-r--r-- | builtin-blame.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |