]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t6030 (bisect): work around Mac OS X "ls"
authorJonathan Nieder <jrnieder@uchicago.edu>
Sun, 27 Jul 2008 04:53:30 +0000 (23:53 -0500)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Jul 2008 21:14:01 +0000 (14:14 -0700)
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>
t/t6030-bisect-porcelain.sh

index 0626544823d6ff9d37ea86c752285d093788df3e..244fda62a5cd34d778cf0789961654eaa37fe589 100755 (executable)
@@ -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 &&