Skip to content

Commit b890fa3

Browse files
Jonathan Niedergitster
authored andcommitted
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>
1 parent 77ef80a commit b890fa3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t6030-bisect-porcelain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ test_expect_success 'bisect fails if given any junk instead of revs' '
7676
test_must_fail git bisect start foo $HASH1 -- &&
7777
test_must_fail git bisect start $HASH4 $HASH1 bar -- &&
7878
test -z "$(git for-each-ref "refs/bisect/*")" &&
79-
test_must_fail ls .git/BISECT_* &&
79+
test -z "$(ls .git/BISECT_* 2>/dev/null)" &&
8080
git bisect start &&
8181
test_must_fail git bisect good foo $HASH1 &&
8282
test_must_fail git bisect good $HASH1 bar &&

0 commit comments

Comments
 (0)