Merge branch 'bc/hash-transition-interop-part-1'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 May 2021 07:59:46 +0000 (16:59 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 May 2021 07:59:46 +0000 (16:59 +0900)
commitaaa3c8065d86e8f25850eb79e90da68d6adcf03f
treeac8883284fe2e056252c14f6916e5ee9312eff1a
parent2d677e5b1537692a4f875740a6e9853c24285f02
parent3dd71461e25b4cc7ea2a2d8deef1c0486bb32580
Merge branch 'bc/hash-transition-interop-part-1'

SHA-256 transition.

* bc/hash-transition-interop-part-1:
  hex: print objects using the hash algorithm member
  hex: default to the_hash_algo on zero algorithm value
  builtin/pack-objects: avoid using struct object_id for pack hash
  commit-graph: don't store file hashes as struct object_id
  builtin/show-index: set the algorithm for object IDs
  hash: provide per-algorithm null OIDs
  hash: set, copy, and use algo field in struct object_id
  builtin/pack-redundant: avoid casting buffers to struct object_id
  Use the final_oid_fn to finalize hashing of object IDs
  hash: add a function to finalize object IDs
  http-push: set algorithm when reading object ID
  Always use oidread to read into struct object_id
  hash: add an algo member to struct object_id
16 files changed:
branch.c
builtin/checkout.c
builtin/grep.c
builtin/ls-files.c
builtin/pack-objects.c
builtin/rebase.c
dir.c
http-push.c
merge-ort.c
merge-recursive.c
read-cache.c
refs.c
refs/debug.c
sequencer.c
submodule.c
wt-status.c