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

Sync with 2.35.5

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

58612f82b660e3378c73f0698d11b0f1fef741da
diff --cc t/t5526-fetch-submodules.sh
index 43dada8544,93a98e1ef0..072c3216df
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@@ -73,60 -37,8 +73,61 @@@ add_submodule_commits () 
  	)
  }
  
 +# For each superproject in the test setup, update its submodule, add the
 +# submodule and create a new commit with the submodule change.
 +#
 +# This requires add_submodule_commits() to be called first, otherwise
 +# the submodules will not have changed and cannot be "git add"-ed.
 +add_superproject_commits () {
 +	(
 +		cd submodule &&
 +		(
 +			cd subdir/deepsubmodule &&
 +			git fetch &&
 +			git checkout -q FETCH_HEAD
 +		) &&
 +		git add subdir/deepsubmodule &&
 +		git commit -m "new deep submodule"
 +	) &&
 +	git add submodule &&
 +	git commit -m "new submodule" &&
 +	super_head=$(git rev-parse --short HEAD) &&
 +	sub_head=$(git -C submodule rev-parse --short HEAD) &&
 +	write_expected_super $super_head &&
 +	write_expected_sub $sub_head
 +}
 +
 +# Verifies that the expected repositories were fetched. This is done by
 +# concatenating the files expect.err.[super|sub|deep] in the correct
 +# order and comparing it to the actual stderr.
 +#
 +# If a repo should not be fetched in the test, its corresponding
 +# expect.err file should be rm-ed.
 +verify_fetch_result () {
 +	ACTUAL_ERR=$1 &&
 +	rm -f expect.err.combined &&
 +	if test -f expect.err.super
 +	then
 +		cat expect.err.super >>expect.err.combined
 +	fi &&
 +	if test -f expect.err.sub
 +	then
 +		cat expect.err.sub >>expect.err.combined
 +	fi &&
 +	if test -f expect.err.deep
 +	then
 +		cat expect.err.deep >>expect.err.combined
 +	fi &&
 +	if test -f expect.err.sub2
 +	then
 +		cat expect.err.sub2 >>expect.err.combined
 +	fi &&
 +	sed -e 's/[0-9a-f][0-9a-f]*\.\./OLD_HEAD\.\./' "$ACTUAL_ERR" >actual.err.cmp &&
 +	test_cmp expect.err.combined actual.err.cmp
 +}
 +
  test_expect_success setup '
+ 	git config --global protocol.file.allow always &&
  	mkdir deepsubmodule &&
  	(
  		cd deepsubmodule &&