Skip to content

Commit ea74993

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 d53e464 + a3d7a50 commit ea74993

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
@@ -702,6 +702,7 @@ test_expect_success 'pattern-checks: contained glob characters' '
702702

703703
test_expect_success BSLASHPSPEC 'pattern-checks: escaped characters' '
704704
git clone repo escaped &&
705+
git -C escaped config advice.sparseIndexExpanded false &&
705706
TREEOID=$(git -C escaped rev-parse HEAD:folder1) &&
706707
NEWTREE=$(git -C escaped mktree <<-EOF
707708
$(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
@@ -156,6 +156,9 @@ test_expect_success 'mv refuses to move sparse-to-non-sparse' '
156156

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

0 commit comments

Comments
 (0)