Merge branch 'po/read-graft-line'
commit8b36f0b196225fc25588220acf921d011d4bf9a7
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Sep 2017 04:11:25 +0000 (6 13:11 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Sep 2017 04:11:25 +0000 (6 13:11 +0900)
tree092fe8f849f4d077323f9546624975b936e05932
parent1fb77b3ee5417e7b6af782e43c8b98256861cca5
parentcfa5bf16082e25c9221e26851ca890f71ddf5a5f
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
builtin/blame.c
commit.h
sha1_file.c