diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-06 13:11:25 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-06 13:11:25 +0900 |
| commit | 8b36f0b196225fc25588220acf921d011d4bf9a7 (patch) | |
| tree | 092fe8f849f4d077323f9546624975b936e05932 /builtin/blame.c | |
| parent | 1fb77b3ee5417e7b6af782e43c8b98256861cca5 (diff) | |
| parent | cfa5bf16082e25c9221e26851ca890f71ddf5a5f (diff) | |
| download | git-8b36f0b196225fc25588220acf921d011d4bf9a7.tar.gz git-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/blame.c')
| -rw-r--r-- | builtin/blame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index e0daf1754..67adaef4d 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); } |