undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  reading $GIT_DIR/info/graft - skip comments correctly.
This commit is contained in:
Junio C Hamano 2006-04-16 17:03:13 -07:00
commit 878bd08d9a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commit.c
View File

@ -161,7 +161,7 @@ struct commit_graft *read_graft_line(char *buf, int len)
if (buf[len-1] == '\n') if (buf[len-1] == '\n')
buf[--len] = 0; buf[--len] = 0;
if (buf[0] == '#') if (buf[0] == '#')
return 0; return NULL;
if ((len + 1) % 41) { if ((len + 1) % 41) {
bad_graft_data: bad_graft_data:
error("bad graft data: %s", buf); 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" */ /* The format is just "Commit Parent1 Parent2 ...\n" */
int len = strlen(buf); int len = strlen(buf);
struct commit_graft *graft = read_graft_line(buf, len); struct commit_graft *graft = read_graft_line(buf, len);
if (!graft)
continue;
if (register_commit_graft(graft, 1)) if (register_commit_graft(graft, 1))
error("duplicate graft data: %s", buf); error("duplicate graft data: %s", buf);
} }