]> granicus.if.org Git - git/commitdiff
Merge branch 'bc/object-id-part17' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Oct 2019 04:13:05 +0000 (13:13 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Oct 2019 04:13:05 +0000 (13:13 +0900)
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
  ...

15 files changed:
1  2 
builtin/clone.c
builtin/index-pack.c
builtin/repack.c
builtin/replace.c
builtin/submodule--helper.c
builtin/worktree.c
cache.h
config.c
connected.c
diff.c
fetch-pack.c
packfile.c
sequencer.c
sha1-file.c
wt-status.c

diff --cc builtin/clone.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge
diff --cc connected.c
Simple merge
diff --cc diff.c
Simple merge
diff --cc fetch-pack.c
Simple merge
diff --cc packfile.c
index 73f60e4211a8371aa3c0f136f926249639fb5c08,52dea88997868a587be6887ad51d38f7194320ab..9a6e66c97e32339785c165e4b8532e503b6825fc
  #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);
diff --cc sequencer.c
Simple merge
diff --cc sha1-file.c
Simple merge
diff --cc wt-status.c
Simple merge