From: Junio C Hamano <junkio@cox.net>
Date: Sun, 16 Apr 2006 21:24:56 +0000 (-0700)
Subject: reading $GIT_DIR/info/graft - skip comments correctly.
X-Git-Tag: v1.3.0~15
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=5bc4ce589646faf72c7a77a5d32d9496ccc8d456;p=git.git

reading $GIT_DIR/info/graft - skip comments correctly.

Noticed by Yann Dirson.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/commit.c b/commit.c
index ca255745..05c4c923 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);
 	}