Skip to content

Commit 2bf0aed

Browse files
committed
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]>
2 parents 5d54b0d + ed3fe89 commit 2bf0aed

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

t/t1091-sparse-checkout-builtin.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,7 @@ test_expect_success 'pattern-checks: contained glob characters' '
701701

702702
test_expect_success BSLASHPSPEC 'pattern-checks: escaped characters' '
703703
git clone repo escaped &&
704+
git -C escaped config advice.sparseIndexExpanded false &&
704705
TREEOID=$(git -C escaped rev-parse HEAD:folder1) &&
705706
NEWTREE=$(git -C escaped mktree <<-EOF
706707
$(git -C escaped ls-tree HEAD)

t/t7002-mv-sparse-checkout.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ test_expect_success 'mv refuses to move sparse-to-non-sparse' '
155155

156156
test_expect_success 'recursive mv refuses to move (possible) sparse' '
157157
test_when_finished rm -rf b c e sub2 &&
158+
159+
git config advice.sparseIndexExpanded false &&
160+
158161
git reset --hard &&
159162
# Without cone mode, "sub" and "sub2" do not match
160163
git sparse-checkout set sub/dir sub2/dir &&

0 commit comments

Comments
 (0)