From: Taylor Blau <me@ttaylorr.com>
Date: Thu, 6 Oct 2022 21:42:55 +0000 (-0400)
Subject: Sync with 2.33.5
X-Git-Tag: v2.34.5~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=478a426f14b92cef92fc09df442b356a53f6fa8f;p=thirdparty%2Fgit.git

Sync with 2.33.5

Signed-off-by: Taylor Blau <me@ttaylorr.com>
---

478a426f14b92cef92fc09df442b356a53f6fa8f
diff --cc t/t4060-diff-submodule-option-diff-format.sh
index d86e38abd8,a90add57f7..97c6424cd5
--- a/t/t4060-diff-submodule-option-diff-format.sh
+++ b/t/t4060-diff-submodule-option-diff-format.sh
@@@ -779,68 -758,10 +779,68 @@@ test_expect_success 'diff --submodule=d
  	diff_cmp expected actual
  '
  
 +mv sm2 sm2-bak
 +
 +test_expect_success 'deleted submodule with .git file' '
 +	git diff-index -p --submodule=diff HEAD >actual &&
 +	cat >expected <<-EOF &&
 +	Submodule sm1 $head7...0000000 (submodule deleted)
 +	Submodule sm2 $head9...0000000 (submodule deleted)
 +	diff --git a/sm2/foo8 b/sm2/foo8
 +	deleted file mode 100644
 +	index 1234567..89abcde
 +	--- a/sm2/foo8
 +	+++ /dev/null
 +	@@ -1 +0,0 @@
 +	-foo8
 +	diff --git a/sm2/foo9 b/sm2/foo9
 +	deleted file mode 100644
 +	index 1234567..89abcde
 +	--- a/sm2/foo9
 +	+++ /dev/null
 +	@@ -1 +0,0 @@
 +	-foo9
 +	EOF
 +	diff_cmp expected actual
 +'
 +
 +echo submodule-to-blob>sm2
 +
 +test_expect_success 'typechanged(submodule->blob) submodule with .git file' '
 +	git diff-index -p --submodule=diff HEAD >actual &&
 +	cat >expected <<-EOF &&
 +	Submodule sm1 $head7...0000000 (submodule deleted)
 +	Submodule sm2 $head9...0000000 (submodule deleted)
 +	diff --git a/sm2/foo8 b/sm2/foo8
 +	deleted file mode 100644
 +	index 1234567..89abcde
 +	--- a/sm2/foo8
 +	+++ /dev/null
 +	@@ -1 +0,0 @@
 +	-foo8
 +	diff --git a/sm2/foo9 b/sm2/foo9
 +	deleted file mode 100644
 +	index 1234567..89abcde
 +	--- a/sm2/foo9
 +	+++ /dev/null
 +	@@ -1 +0,0 @@
 +	-foo9
 +	diff --git a/sm2 b/sm2
 +	new file mode 100644
 +	index 1234567..89abcde
 +	--- /dev/null
 +	+++ b/sm2
 +	@@ -0,0 +1 @@
 +	+submodule-to-blob
 +	EOF
 +	diff_cmp expected actual
 +'
 +
 +rm sm2
 +mv sm2-bak sm2
 +
  test_expect_success 'setup nested submodule' '
- 	git -C sm2 submodule add ../sm2 nested &&
 -	git -c protocol.file.allow=always submodule add -f ./sm2 &&
 -	git commit -a -m "add sm2" &&
+ 	git -c protocol.file.allow=always -C sm2 submodule add ../sm2 nested &&
  	git -C sm2 commit -a -m "nested sub" &&
  	head10=$(git -C sm2 rev-parse --short --verify HEAD)
  '
diff --cc t/t7418-submodule-sparse-gitmodules.sh
index f87e524d6d,16331c34c4..0897516ca9
--- a/t/t7418-submodule-sparse-gitmodules.sh
+++ b/t/t7418-submodule-sparse-gitmodules.sh
@@@ -12,11 -12,12 +12,15 @@@ The test setup uses a sparse checkout, 
  also by committing .gitmodules and then just removing it from the filesystem.
  '
  
 +GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
 +export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
 +
  . ./test-lib.sh
  
+ test_expect_success 'setup' '
+ 	git config --global protocol.file.allow always
+ '
+ 
  test_expect_success 'sparse checkout setup which hides .gitmodules' '
  	git init upstream &&
  	git init submodule &&