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

Sync with 2.30.6

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

122512967e6184b1888a63ea2b6ed9ada3046b28
diff --cc GIT-VERSION-GEN
index 2126fe83f8,40fa0b5255..91a5ae7739
--- a/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 t/t3420-rebase-autostash.sh
index 43fcb68f27,80df13a9a9..693934ee8b
--- a/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/t5617-clone-submodules-remote.sh
index e2dbb4eaba,0152dc0440..5691f27405
--- a/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 config --global protocol.file.allow always &&
 -	git checkout -b master &&
 +	git checkout -b main &&
  	test_commit commit1 &&
  	mkdir sub &&
  	(
diff --cc t/t7001-mv.sh
index 25bb9bbb89,6156eeb9ad..ef505aeff6
--- a/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/t7400-submodule-basic.sh
index a924fdb7a6,bf1a4dfadb..eca1e47ccf
--- a/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/t7409-submodule-detached-work-tree.sh
index e17ac81a89,e12eed5a30..374ed481e9
--- a/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 f0f6b9fa9e,b17d18034a..2f4b25dfd7
--- a/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/t9350-fast-export.sh
index 409b48e244,703428fd0a..3e0b0398cf
--- a/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' '
  
+ 	test_config_global protocol.file.allow always &&
 -	git checkout -f master &&
 +	git checkout -f main &&
  	mkdir sub &&
  	(
  		cd sub &&
@@@ -293,8 -291,9 +294,9 @@@
  
  test_expect_success 'submodule fast-export | fast-import' '
  
+ 	test_config_global protocol.file.allow always &&
 -	SUBENT1=$(git ls-tree master^ sub) &&
 -	SUBENT2=$(git ls-tree master sub) &&
 +	SUBENT1=$(git ls-tree main^ sub) &&
 +	SUBENT2=$(git ls-tree main sub) &&
  	rm -rf new &&
  	mkdir new &&
  	git --git-dir=new/.git init &&