summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-10 18:33:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-10 18:33:36 (GMT)
commit3b9d69ec22b8821fecc44c07ea49adc749484335 (patch)
tree89993616989d8d5a43cbcf5a39ac651c70a2272f /commit.c
parentf0f493ec58489c739839e8d257a04159889639c6 (diff)
parente228c1736f25c59cd6da51ed97e03ecd80a935e6 (diff)
downloadgit-3b9d69ec22b8821fecc44c07ea49adc749484335.zip
git-3b9d69ec22b8821fecc44c07ea49adc749484335.tar.gz
git-3b9d69ec22b8821fecc44c07ea49adc749484335.tar.bz2
Merge branch 'js/lift-parent-count-limit'
There is no reason to have a hardcoded upper limit of the number of parents for an octopus merge, created via the graft mechanism. * js/lift-parent-count-limit: Remove the line length limit for graft files
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/commit.c b/commit.c
index 5ff5538..b9f9838 100644
--- a/commit.c
+++ b/commit.c
@@ -196,19 +196,19 @@ bad_graft_data:
static int read_graft_file(const char *graft_file)
{
FILE *fp = fopen(graft_file, "r");
- char buf[1024];
+ struct strbuf buf = STRBUF_INIT;
if (!fp)
return -1;
- while (fgets(buf, sizeof(buf), fp)) {
+ while (!strbuf_getwholeline(&buf, fp, '\n')) {
/* The format is just "Commit Parent1 Parent2 ...\n" */
- int len = strlen(buf);
- struct commit_graft *graft = read_graft_line(buf, len);
+ struct commit_graft *graft = read_graft_line(buf.buf, buf.len);
if (!graft)
continue;
if (register_commit_graft(graft, 1))
- error("duplicate graft data: %s", buf);
+ error("duplicate graft data: %s", buf.buf);
}
fclose(fp);
+ strbuf_release(&buf);
return 0;
}