Sync with 2.33.5

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

diff --cc builtin/clone.c
Simple merge

diff --cc t/t1091-sparse-checkout-builtin.sh
Simple merge

diff --cc t/t1092-sparse-checkout-compatibility.sh
Simple merge

diff --cc t/t4060-diff-submodule-option-diff-format.sh
index d86e38abd882220ec60d45b2a351d2947f7dcfcb,a90add57f7d647d072f3119d6f739faf4ddbb85d..97c6424cd51714eeadffd5899c709a409b1cedd9
--- 1/t/t4060-diff-submodule-option-diff-format.sh
--- 2/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/t5526-fetch-submodules.sh
Simple merge

diff --cc t/t5545-push-options.sh
Simple merge

diff --cc t/t5572-pull-submodule.sh
Simple merge

diff --cc t/t7001-mv.sh
Simple merge

diff --cc t/t7064-wtstatus-pv2.sh
Simple merge

diff --cc t/t7418-submodule-sparse-gitmodules.sh
index f87e524d6d467fd723c083c105f092850051f566,16331c34c446413721ac9c3d804244967699edda..0897516ca90b7b8035e451bd5eabca24528b7ab5
--- 1/t/t7418-submodule-sparse-gitmodules.sh
--- 2/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 &&

diff --cc t/t7800-difftool.sh
Simple merge

diff --cc t/t7814-grep-recurse-submodules.sh
Simple merge

diff --cc transport.c
Simple merge