diff options
| author | Jonathan Nieder <jrnieder@uchicago.edu> | 2008-07-26 23:53:30 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-27 14:14:01 -0700 |
| commit | b890fa33a41c0976171d80590286d2bc8bda3df6 (patch) | |
| tree | 3dff2bcb88a6c841d423b89fbc72cf91340f6bb9 /t/t6030-bisect-porcelain.sh | |
| parent | 77ef80a83e652d65a26213bc276b33051524998f (diff) | |
| download | git-b890fa33a41c0976171d80590286d2bc8bda3df6.tar.gz | |
t6030 (bisect): work around Mac OS X "ls"
t6030-bisect-porcelain.sh relies on "ls" exiting with nonzero
status when asked to list nonexistent files. Unfortunately,
/bin/ls on Mac OS X 10.3 exits with exit code 0. So look at
its output instead.
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Acked-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6030-bisect-porcelain.sh')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 0626544823..244fda62a5 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -76,7 +76,7 @@ test_expect_success 'bisect fails if given any junk instead of revs' ' test_must_fail git bisect start foo $HASH1 -- && test_must_fail git bisect start $HASH4 $HASH1 bar -- && test -z "$(git for-each-ref "refs/bisect/*")" && - test_must_fail ls .git/BISECT_* && + test -z "$(ls .git/BISECT_* 2>/dev/null)" && git bisect start && test_must_fail git bisect good foo $HASH1 && test_must_fail git bisect good $HASH1 bar && |