summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-02-05 14:03:01 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-02-05 14:03:01 -0800
commit3c864743a68a81b5a15bbd92afcea74470c1bc2f (patch)
treec36b51250e9ca8a6d55a77a10d297a8090477a91 /builtin
parentMerge branch 'nd/add-empty-fix' into maint (diff)
parentRemove the line length limit for graft files (diff)
downloadtgif-3c864743a68a81b5a15bbd92afcea74470c1bc2f.tar.xz
Merge branch 'js/lift-parent-count-limit' into maint
There is no reason to have a hardcoded upper limit of the number of parents for an octopus merge, created via the graft mechanism, but there was. * js/lift-parent-count-limit: Remove the line length limit for graft files
Diffstat (limited to 'builtin')
-rw-r--r--builtin/blame.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 1407ae7eb2..9047b6ef4c 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -1804,17 +1804,17 @@ static int prepare_lines(struct scoreboard *sb)
static int read_ancestry(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)
register_commit_graft(graft, 0);
}
fclose(fp);
+ strbuf_release(&buf);
return 0;
}