Sync with 2.31.5

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

diff --cc GIT-VERSION-GEN
index c8237bb5e97a602aa8f57077537707c732bff284,91a5ae773930c9f8c111bc8982bb490e9418ee12..076cdd3151cd7b02a56ed797007cc97752daf3f9
--- 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.32.3
 -DEF_VER=v2.31.5
++DEF_VER=v2.32.4
  
  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/t3512-cherry-pick-submodule.sh
Simple merge

diff --cc t/t5572-pull-submodule.sh
index 4f92a116e1f0ec48bdf79f1963da32c8ecdcd8dd,2269b55882e6672be5759243b0e475d685a2a514..3fd41510300f08a91eefd33d14c2e94fe89aec4b
--- 1/t/t5572-pull-submodule.sh
--- 2/t/t5572-pull-submodule.sh
+++ b/t/t5572-pull-submodule.sh
@@@ -42,13 -42,14 +42,17 @@@ git_pull_noff () 
        $2 git pull --no-ff
  }
  
 -KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
 -KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
 +if test "$GIT_TEST_MERGE_ALGORITHM" != ort
 +then
 +      KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
 +      KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
 +fi
  test_submodule_switch_func "git_pull_noff"
  
+ test_expect_success 'setup' '
+       git config --global protocol.file.allow always
+ '
+ 
  test_expect_success 'pull --recurse-submodule setup' '
        test_create_repo child &&
        test_commit -C child bar &&

diff --cc t/t5601-clone.sh
Simple merge

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

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

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

diff --cc t/t7450-bad-git-dotfiles.sh
Simple merge

diff --cc transport.c
Simple merge