diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:36 -0800 |
| commit | ccb47391c1e35c5475529cb8f3bd66028df5a943 (patch) | |
| tree | 4582fe64db169fe96e26d2cbeea73e0036079d04 | |
| parent | 1bf986bc9c1e823da27465bfd9faf2b725bbcc09 (diff) | |
| parent | 9b680fbd3b47f39e44fe989971676996d4744ed7 (diff) | |
| download | git-ccb47391c1e35c5475529cb8f3bd66028df5a943.tar.gz | |
Merge branch 'dt/t7063-fix-flaky-test' into maint
* dt/t7063-fix-flaky-test:
t7063: fix flaky untracked-cache test
| -rwxr-xr-x | t/t7063-status-untracked-cache.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh index 37a24c1312..0e8d0d42f2 100755 --- a/t/t7063-status-untracked-cache.sh +++ b/t/t7063-status-untracked-cache.sh @@ -412,7 +412,9 @@ test_expect_success 'create/modify files, some of which are gitignored' ' echo two bis >done/two && echo three >done/three && # three is gitignored echo four >done/four && # four is gitignored at a higher level - echo five >done/five # five is not gitignored + echo five >done/five && # five is not gitignored + echo test >base && #we need to ensure that the root dir is touched + rm base ' test_expect_success 'test sparse status with untracked cache' ' |