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>
Jonathan Nieder committed
Jul 26, 2008 at 23:53 UTC
b890fa33a41c0976171d80590286d2bc8bda3df6
1 file changed
+1
-1
t/t6030-bisect-porcelain.sh
+1
-1
@@ -76,7 +76,7 @@ test_expect_success 'bisect fails if given any junk instead of revs' '
76
test_must_fail git bisect start foo $HASH1 -- &&
77
test_must_fail git bisect start $HASH4 $HASH1 bar -- &&
78
test -z "$(git for-each-ref "refs/bisect/*")" &&
79
- test_must_fail ls .git/BISECT_* &&
79
+ test -z "$(ls .git/BISECT_* 2>/dev/null)" &&
80
git bisect start &&
81
test_must_fail git bisect good foo $HASH1 &&
82
test_must_fail git bisect good $HASH1 bar &&