From: Junio C Hamano Date: Fri, 4 Oct 2019 04:13:05 +0000 (+0900) Subject: Merge branch 'bc/object-id-part17' into next X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0460b0db29563d086fcb567a3712bbc22fa201d;p=git Merge branch 'bc/object-id-part17' into next Preparation for SHA-256 upgrade continues. * bc/object-id-part17: (26 commits) midx: switch to using the_hash_algo builtin/show-index: replace sha1_to_hex rerere: replace sha1_to_hex builtin/receive-pack: replace sha1_to_hex builtin/index-pack: replace sha1_to_hex packfile: replace sha1_to_hex wt-status: convert struct wt_status to object_id cache: remove null_sha1 builtin/worktree: switch null_sha1 to null_oid builtin/repack: write object IDs of the proper length pack-write: use hash_to_hex when writing checksums sequencer: convert to use the_hash_algo bisect: switch to using the_hash_algo sha1-lookup: switch hard-coded constants to the_hash_algo config: use the_hash_algo in abbrev comparison combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo bundle: switch to use the_hash_algo connected: switch GIT_SHA1_HEXSZ to the_hash_algo show-index: switch hard-coded constants to the_hash_algo blame: remove needless comparison with GIT_SHA1_HEXSZ ... --- b0460b0db29563d086fcb567a3712bbc22fa201d diff --cc packfile.c index 73f60e4211,52dea88997..9a6e66c97e --- a/packfile.c +++ b/packfile.c @@@ -17,10 -17,9 +17,10 @@@ #include "object-store.h" #include "midx.h" #include "commit-graph.h" +#include "promisor-remote.h" char *odb_pack_name(struct strbuf *buf, - const unsigned char *sha1, + const unsigned char *hash, const char *ext) { strbuf_reset(buf);