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

Sync with 2.31.5

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

9cbd2827c5a19d935054cdb162e53e5703be09f4
diff --cc GIT-VERSION-GEN
index c8237bb5e9,91a5ae7739..076cdd3151
--- a/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 t/t5572-pull-submodule.sh
index 4f92a116e1,2269b55882..3fd4151030
--- a/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 &&