Merge branch 'backport-sparse-index-advice'

This backports the `ds/advice-sparse-index-expansion` patches into `microsoft/git` which _just_ missed the v2.46.0 window. Signed-off-by: Johannes Schindelin <[email protected]>
microsoft · Dec 31, 2024 · 2bf0aed · 2bf0aed
2 parents 5d54b0d + ed3fe89
commit 2bf0aed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh
@@ -701,6 +701,7 @@ test_expect_success 'pattern-checks: contained glob characters' '
 
 test_expect_success BSLASHPSPEC 'pattern-checks: escaped characters' '
 	git clone repo escaped &&
+	git -C escaped config advice.sparseIndexExpanded false &&
 	TREEOID=$(git -C escaped rev-parse HEAD:folder1) &&
 	NEWTREE=$(git -C escaped mktree <<-EOF
 	$(git -C escaped ls-tree HEAD)

diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh
@@ -155,6 +155,9 @@ test_expect_success 'mv refuses to move sparse-to-non-sparse' '
 
 test_expect_success 'recursive mv refuses to move (possible) sparse' '
 	test_when_finished rm -rf b c e sub2 &&
+
+	git config advice.sparseIndexExpanded false &&
+
 	git reset --hard &&
 	# Without cone mode, "sub" and "sub2" do not match
 	git sparse-checkout set sub/dir sub2/dir &&