projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include header to define uint32_t, necessary on Mac OS X
[git.git]
/
commit.c
diff --git
a/commit.c
b/commit.c
index
ca25574
..
2717dd8
100644
(file)
--- a/
commit.c
+++ b/
commit.c
@@
-160,8
+160,8
@@
struct commit_graft *read_graft_line(char *buf, int len)
if (buf[len-1] == '\n')
buf[--len] = 0;
if (buf[len-1] == '\n')
buf[--len] = 0;
- if (buf[0] == '#')
- return
0
;
+ if (buf[0] == '#'
|| buf[0] == '\0'
)
+ return
NULL
;
if ((len + 1) % 41) {
bad_graft_data:
error("bad graft data: %s", buf);
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);
/* 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);
}
if (register_commit_graft(graft, 1))
error("duplicate graft data: %s", buf);
}