From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 Oct 2019 05:24:46 +0000 (+0900)
Subject: Merge branch 'bc/object-id-part17'
X-Git-Tag: v2.24.0-rc0~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=676278f8ea1b9bdd8f235eceb739d7aec4f0ed67;p=thirdparty%2Fgit.git

Merge branch 'bc/object-id-part17'

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
  ...
---

676278f8ea1b9bdd8f235eceb739d7aec4f0ed67
diff --cc packfile.c
index f3f962af4c,52dea88997..dd4b0e51c4
--- 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);