summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-09-06 13:11:25 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-06 13:11:25 +0900
commit8b36f0b196225fc25588220acf921d011d4bf9a7 (patch)
tree092fe8f849f4d077323f9546624975b936e05932 /builtin
parentMerge branch 'ks/branch-set-upstream' (diff)
parentcommit: rewrite read_graft_line (diff)
downloadtgif-8b36f0b196225fc25588220acf921d011d4bf9a7.tar.xz
Merge branch 'po/read-graft-line'
Conversion from uchar[20] to struct object_id continues; this is to ensure that we do not assume sizeof(struct object_id) is the same as the length of SHA-1 hash (or length of longest hash we support). * po/read-graft-line: commit: rewrite read_graft_line commit: allocate array using object_id size commit: replace the raw buffer with strbuf in read_graft_line sha1_file: fix definition of null_sha1
Diffstat (limited to 'builtin')
-rw-r--r--builtin/blame.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index e0daf17548..67adaef4d8 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -488,7 +488,7 @@ static int read_ancestry(const char *graft_file)
return -1;
while (!strbuf_getwholeline(&buf, fp, '\n')) {
/* The format is just "Commit Parent1 Parent2 ...\n" */
- struct commit_graft *graft = read_graft_line(buf.buf, buf.len);
+ struct commit_graft *graft = read_graft_line(&buf);
if (graft)
register_commit_graft(graft, 0);
}