From 5bc4ce589646faf72c7a77a5d32d9496ccc8d456 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 16 Apr 2006 14:24:56 -0700 Subject: [PATCH] reading $GIT_DIR/info/graft - skip comments correctly. Noticed by Yann Dirson. Signed-off-by: Junio C Hamano --- commit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/commit.c b/commit.c index ca25574500..05c4c923fa 100644 --- a/commit.c +++ b/commit.c @@ -161,7 +161,7 @@ struct commit_graft *read_graft_line(char *buf, int len) if (buf[len-1] == '\n') buf[--len] = 0; if (buf[0] == '#') - return 0; + return NULL; if ((len + 1) % 41) { bad_graft_data: error("bad graft data: %s", buf); @@ -192,6 +192,8 @@ int read_graft_file(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); + if (!graft) + continue; if (register_commit_graft(graft, 1)) error("duplicate graft data: %s", buf); }