Sync with 2.30.6

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

diff --cc GIT-VERSION-GEN
index 2126fe83f839e73b2f16c176091291d0f5f38cb4,40fa0b5255b5853b588cf873869b8056409eb67b..91a5ae773930c9f8c111bc8982bb490e9418ee12
--- 1/GIT-VERSION-GEN
--- 2/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
- DEF_VER=v2.31.4
 -DEF_VER=v2.30.6
++DEF_VER=v2.31.5
  
  LF='
  '

diff --cc builtin/clone.c
Simple merge

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

diff --cc t/t1500-rev-parse.sh
Simple merge

diff --cc t/t2400-worktree-add.sh
Simple merge

diff --cc t/t2405-worktree-submodule.sh
Simple merge

diff --cc t/t3200-branch.sh
Simple merge

diff --cc t/t3420-rebase-autostash.sh
index 43fcb68f27e439b5542e82a85bc77e401adc6e98,80df13a9a90d4647289a0b2e544e8c696c0dbefc..693934ee8be9600e6edda9e691b5415f8c153b34
--- 1/t/t3420-rebase-autostash.sh
--- 2/t/t3420-rebase-autostash.sh
+++ b/t/t3420-rebase-autostash.sh
@@@ -308,9 -305,9 +308,9 @@@ test_expect_success 'autostash is save
  '
  
  test_expect_success 'autostash with dirty submodules' '
 -      test_when_finished "git reset --hard && git checkout master" &&
 +      test_when_finished "git reset --hard && git checkout main" &&
        git checkout -b with-submodule &&
-       git submodule add ./ sub &&
+       git -c protocol.file.allow=always submodule add ./ sub &&
        test_tick &&
        git commit -m add-submodule &&
        echo changed >sub/file0 &&

diff --cc t/t3512-cherry-pick-submodule.sh
Simple merge

diff --cc t/t3600-rm.sh
Simple merge

diff --cc t/t4060-diff-submodule-option-diff-format.sh
Simple merge

diff --cc t/t4208-log-magic-pathspec.sh
Simple merge

diff --cc t/t5510-fetch.sh
Simple merge

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/t5601-clone.sh
Simple merge

diff --cc t/t5604-clone-reference.sh
Simple merge

diff --cc t/t5614-clone-submodules-shallow.sh
Simple merge

diff --cc t/t5616-partial-clone.sh
Simple merge

diff --cc t/t5617-clone-submodules-remote.sh
index e2dbb4eabae2aa141b3b1d5a1a5b0e4cdd9d0e65,0152dc04400fffc513a8b01774abf2c5fed535ff..5691f27405c060293ea400b551e86dc21e7aee91
--- 1/t/t5617-clone-submodules-remote.sh
--- 2/t/t5617-clone-submodules-remote.sh
+++ b/t/t5617-clone-submodules-remote.sh
@@@ -10,7 -7,8 +10,8 @@@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_
  pwd=$(pwd)
  
  test_expect_success 'setup' '
 -      git checkout -b master &&
+       git config --global protocol.file.allow always &&
 +      git checkout -b main &&
        test_commit commit1 &&
        mkdir sub &&
        (

diff --cc t/t6008-rev-list-submodule.sh
Simple merge

diff --cc t/t6134-pathspec-in-submodule.sh
Simple merge

diff --cc t/t7001-mv.sh
index 25bb9bbb89994a1cb850b349342cef322c864b65,6156eeb9ade72cb1ccbbe6763fd595f90a07dfc1..ef505aeff63be50e77300c7790463229f49ad392
--- 1/t/t7001-mv.sh
--- 2/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@@ -489,11 -514,11 +490,12 @@@ test_expect_success 'moving a submodul
  '
  
  test_expect_success 'moving nested submodules' '
+       test_config_global protocol.file.allow always &&
        git commit -am "cleanup commit" &&
        mkdir sub_nested_nested &&
 -      (cd sub_nested_nested &&
 -              touch nested_level2 &&
 +      (
 +              cd sub_nested_nested &&
 +              >nested_level2 &&
                git init &&
                git add . &&
                git commit -m "nested level 2"

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

diff --cc t/t7300-clean.sh
Simple merge

diff --cc t/t7400-submodule-basic.sh
index a924fdb7a6c9aaf6c1b860dd4c783d87b803c36f,bf1a4dfadb16821406237225365f638353b70d97..eca1e47ccf615101e48f928c2fd638ef3104ff6c
--- 1/t/t7400-submodule-basic.sh
--- 2/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@@ -9,11 -9,12 +9,15 @@@ This test tries to verify basic sanity 
  subcommands of git submodule.
  '
  
 +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 +
  . ./test-lib.sh
  
+ test_expect_success 'setup - enable local submodules' '
+       git config --global protocol.file.allow always
+ '
+ 
  test_expect_success 'submodule deinit works on empty repository' '
        git submodule deinit --all
  '

diff --cc t/t7403-submodule-sync.sh
Simple merge

diff --cc t/t7406-submodule-update.sh
Simple merge

diff --cc t/t7407-submodule-foreach.sh
Simple merge

diff --cc t/t7409-submodule-detached-work-tree.sh
index e17ac81a893e329828c5bfe1458f4db1a2fb4841,e12eed5a30135cc848535cbfbcb1e9f613065b9b..374ed481e9c64b9813a11b57c80f7b6f22c791e1
--- 1/t/t7409-submodule-detached-work-tree.sh
--- 2/t/t7409-submodule-detached-work-tree.sh
+++ b/t/t7409-submodule-detached-work-tree.sh
@@@ -10,11 -10,12 +10,15 @@@ on detached working tree
  '
  
  TEST_NO_CREATE_REPO=1
 +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 +
  . ./test-lib.sh
  
+ test_expect_success 'setup' '
+       git config --global protocol.file.allow always
+ '
+ 
  test_expect_success 'submodule on detached working tree' '
        git init --bare remote &&
        test_create_repo bundle1 &&

diff --cc t/t7417-submodule-path-url.sh
index f0f6b9fa9e9a029bd8a17337beb402d1618ca948,b17d18034a3b1258ef0aa6d98b5031a14060d6f3..2f4b25dfd7e3860e47c0acdd3a9eeabff7f5504e
--- 1/t/t7417-submodule-path-url.sh
--- 2/t/t7417-submodule-path-url.sh
+++ b/t/t7417-submodule-path-url.sh
@@@ -1,11 -1,12 +1,15 @@@
  #!/bin/sh
  
  test_description='check handling of .gitmodule path with dash'
 +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 +
  . ./test-lib.sh
  
+ test_expect_success 'setup' '
+       git config --global protocol.file.allow always
+ '
+ 
  test_expect_success 'create submodule with dash in path' '
        git init upstream &&
        git -C upstream commit --allow-empty -m base &&

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

diff --cc t/t9350-fast-export.sh
index 409b48e244224629a11ced5d9cbd99fd81f167ae,703428fd0a3f39ef9cce2ccb21d91397d0a9aee4..3e0b0398cf8eeb05b3eff0e65819dd87360655cc
--- 1/t/t9350-fast-export.sh
--- 2/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@@ -268,7 -265,8 +268,8 @@@ test_expect_success 'signed-tags=warn-s
  
  test_expect_success 'setup submodule' '
  
 -      git checkout -f master &&
+       test_config_global protocol.file.allow always &&
 +      git checkout -f main &&
        mkdir sub &&
        (
                cd sub &&
@@@ -293,8 -291,9 +294,9 @@@
  
  test_expect_success 'submodule fast-export | fast-import' '
  
 -      SUBENT1=$(git ls-tree master^ sub) &&
 -      SUBENT2=$(git ls-tree master sub) &&
+       test_config_global protocol.file.allow always &&
 +      SUBENT1=$(git ls-tree main^ sub) &&
 +      SUBENT2=$(git ls-tree main sub) &&
        rm -rf new &&
        mkdir new &&
        git --git-dir=new/.git init &&

diff --cc transport.c
Simple merge