Skip to content

Commit

Permalink
Merge branch 'dt/t7063-fix-flaky-test'
Browse files Browse the repository at this point in the history
* dt/t7063-fix-flaky-test:
  t7063: fix flaky untracked-cache test
  • Loading branch information
Junio C Hamano committed Oct 26, 2015
2 parents 2be421d + 9b680fb commit 9d4a069
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion t/t7063-status-untracked-cache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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' '
Expand Down

0 comments on commit 9d4a069

Please sign in to comment.