]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'bc/sha1-256-interop-01' into jch
authorJunio C Hamano <gitster@pobox.com>
Sun, 5 Oct 2025 22:04:18 +0000 (15:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 5 Oct 2025 22:04:18 +0000 (15:04 -0700)
The beginning of SHA1-SHA256 interoperability work.

* bc/sha1-256-interop-01:
  t1010: use BROKEN_OBJECTS prerequisite
  t: allow specifying compatibility hash
  fsck: consider gpgsig headers expected in tags
  rev-parse: allow printing compatibility hash
  docs: add documentation for loose objects
  docs: improve ambiguous areas of pack format documentation
  docs: reflect actual double signature for tags
  docs: update offset order for pack index v3
  docs: update pack index v3 format

1  2 
Documentation/Makefile
Documentation/fsck-msgids.adoc
Documentation/meson.build
builtin/rev-parse.c
fsck.h
t/test-lib.sh

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fsck.h
Simple merge
diff --cc t/test-lib.sh
Simple merge