]> git.ipfire.org Git - thirdparty/git.git/commit - patch-ids.c
Merge branch 'eb/hash-transition'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Mar 2024 21:13:50 +0000 (14:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Mar 2024 21:13:50 +0000 (14:13 -0700)
commit1002f28a527d33893f7dab068dbac7011f84af65
tree9b9ada23d952e936d496597d03064c10d8d9f73d
parentc75fd8d8150afdf836b63a8e0534d9b9e3e111ba
parent7673ecd2dcdcf0aae01cccdb5c25f9b96160a8c0
Merge branch 'eb/hash-transition'

Work to support a repository that work with both SHA-1 and SHA-256
hash algorithms has started.

* eb/hash-transition: (30 commits)
  t1016-compatObjectFormat: add tests to verify the conversion between objects
  t1006: test oid compatibility with cat-file
  t1006: rename sha1 to oid
  test-lib: compute the compatibility hash so tests may use it
  builtin/ls-tree: let the oid determine the output algorithm
  object-file: handle compat objects in check_object_signature
  tree-walk: init_tree_desc take an oid to get the hash algorithm
  builtin/cat-file: let the oid determine the output algorithm
  rev-parse: add an --output-object-format parameter
  repository: implement extensions.compatObjectFormat
  object-file: update object_info_extended to reencode objects
  object-file-convert: convert commits that embed signed tags
  object-file-convert: convert commit objects when writing
  object-file-convert: don't leak when converting tag objects
  object-file-convert: convert tag objects when writing
  object-file-convert: add a function to convert trees between algorithms
  object: factor out parse_mode out of fast-import and tree-walk into in object.h
  cache: add a function to read an OID of a specific algorithm
  tag: sign both hashes
  commit: export add_header_signature to support handling signatures on tags
  ...
48 files changed:
Documentation/config/extensions.txt
Documentation/git-rev-parse.txt
Makefile
archive.c
builtin/am.c
builtin/cat-file.c
builtin/checkout.c
builtin/clone.c
builtin/commit.c
builtin/fast-import.c
builtin/grep.c
builtin/ls-tree.c
builtin/merge.c
builtin/pack-objects.c
builtin/read-tree.c
builtin/rev-parse.c
builtin/stash.c
builtin/tag.c
cache-tree.c
commit.c
commit.h
delta-islands.c
diff-lib.c
fsck.c
http-push.c
list-objects.c
merge-ort.c
merge-recursive.c
merge.c
object-file.c
object-name.c
object.c
object.h
pack-bitmap-write.c
packfile.c
reflog.c
repository.c
repository.h
revision.c
setup.c
setup.h
t/helper/test-tool.c
t/helper/test-tool.h
t/t1006-cat-file.sh
t/test-lib-functions.sh
tree-walk.c
tree-walk.h
tree.c