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>
This commit is contained in:
parent
77ef80a83e
commit
b890fa33a4
@ -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 &&
|
||||
|
Loading…
Reference in New Issue
Block a user