Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'dt/t7063-fix-flaky-test' into maint
author
Junio C Hamano
<gitster@pobox.com>
Tue, 3 Nov 2015 23:32:36 +0000
(15:32 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 3 Nov 2015 23:32:36 +0000
(15:32 -0800)
* dt/t7063-fix-flaky-test:
t7063: fix flaky untracked-cache test
t/t7063-status-untracked-cache.sh
patch
|
blob
|
history
raw
(from parent 1:
1bf986b
)
diff --git
a/t/t7063-status-untracked-cache.sh
b/t/t7063-status-untracked-cache.sh
index 37a24c131240c46d0694e0a148ec7c15b89e17fe..0e8d0d42f2f5b1edbc18d46da77c956cd99dadec 100755
(executable)
--- 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' '