diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-27 13:14:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-27 13:14:38 -0700 |
| commit | 77bd3ea9f54f1584147b594abc04c26ca516d987 (patch) | |
| tree | 0ccf888f68194e3b3c1b8a017ca42a5e1ec1d212 | |
| parent | Sync with 2.4.2 (diff) | |
| parent | t7063: hide stderr from setup inside prereq (diff) | |
| download | tgif-77bd3ea9f54f1584147b594abc04c26ca516d987.tar.xz | |
Merge branch 'nd/untracked-cache'
* nd/untracked-cache:
t7063: hide stderr from setup inside prereq
| -rwxr-xr-x | t/t7063-status-untracked-cache.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh index 2b2ffd7d6b..bd4806c12a 100755 --- a/t/t7063-status-untracked-cache.sh +++ b/t/t7063-status-untracked-cache.sh @@ -8,10 +8,14 @@ avoid_racy() { sleep 1 } -git update-index --untracked-cache # It's fine if git update-index returns an error code other than one, # it'll be caught in the first test. -if test $? -eq 1; then +test_lazy_prereq UNTRACKED_CACHE ' + { git update-index --untracked-cache; ret=$?; } && + test $ret -ne 1 +' + +if ! test_have_prereq UNTRACKED_CACHE; then skip_all='This system does not support untracked cache' test_done fi |