]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'bc/submodule-force-same-hash'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Nov 2025 23:46:39 +0000 (15:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Nov 2025 23:46:40 +0000 (15:46 -0800)
Adding a repository that uses a different hash function is a no-no,
but "git submodule add" did nt prevent it, which has been corrected.

* bc/submodule-force-same-hash:
  read-cache: drop submodule check from add_to_cache()
  object-file: disallow adding submodules of different hash algo

1  2 
object-file.c
read-cache.c

diff --cc object-file.c
Simple merge
diff --cc read-cache.c
Simple merge