Skip to content

Commit 7f13e5c

Browse files
committed
Merge branch 'mf/t0008-cleanup'
Test clean-up. * mf/t0008-cleanup: t0008: improve test cleanup to fix failing test
2 parents 448cea8 + 48430e4 commit 7f13e5c

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

t/t0008-ignores.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ test_expect_success SYMLINKS 'symlinks respected in info/exclude' '
946946
'
947947

948948
test_expect_success SYMLINKS 'symlinks not respected in-tree' '
949-
test_when_finished "rm .gitignore" &&
949+
test_when_finished "rm -rf subdir .gitignore err actual" &&
950950
ln -s ignore .gitignore &&
951951
mkdir subdir &&
952952
ln -s ignore subdir/.gitignore &&
@@ -957,6 +957,7 @@ test_expect_success SYMLINKS 'symlinks not respected in-tree' '
957957

958958
test_expect_success EXPENSIVE 'large exclude file ignored in tree' '
959959
test_when_finished "rm .gitignore" &&
960+
find . -name .gitignore -exec rm "{}" ";" &&
960961
dd if=/dev/zero of=.gitignore bs=101M count=1 &&
961962
git ls-files -o --exclude-standard 2>err &&
962963
echo "warning: ignoring excessively large pattern file: .gitignore" >expect &&

0 commit comments

Comments
 (0)