From: Jonathan Nieder Date: Sun, 27 Jul 2008 04:53:30 +0000 (-0500) Subject: t6030 (bisect): work around Mac OS X "ls" X-Git-Tag: v1.6.0-rc1~11 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b890fa33a41c0976171d80590286d2bc8bda3df6;p=git.git 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 Acked-by: Christian Couder Signed-off-by: Junio C Hamano --- diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 062654482..244fda62a 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 &&