From: Junio C Hamano Date: Tue, 22 Aug 2017 17:36:59 +0000 (-0700) Subject: Merge branch 'po/read-graft-line' into next X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1e3fe0d3a197c138a00deba6abd2195c39b713c9 Merge branch 'po/read-graft-line' into next 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 --- 1e3fe0d3a197c138a00deba6abd2195c39b713c9