Skip to content

Commit

Permalink
t: remove advice from some tests
Browse files Browse the repository at this point in the history
These seem to be custom tests to microsoft/git as they break without
these changes, but these changes are not needed upstream.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
  • Loading branch information
derrickstolee committed Jul 16, 2024
1 parent 46eed1b commit 7976fdc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions t/t1091-sparse-checkout-builtin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions t/t1092-sparse-checkout-compatibility.sh
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,8 @@ test_expect_success 'diff --cached' '
test_expect_success 'diff partially-staged' '
init_repos &&
git -C full-checkout config advice.sparseIndexExpanded false &&
write_script edit-contents <<-\EOF &&
echo text >>$1
EOF
Expand Down
3 changes: 3 additions & 0 deletions t/t7002-mv-sparse-checkout.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit 7976fdc

Please sign in to comment.