[PATCH v3] t6030 (bisect): work around Mac OS X "ls"
- From
Jonathan Nieder <jrnieder@uchicago.edu>
- Date
- Jul 24, 2008, 17:51 UTC
- Message-ID
- <Pine.GSO.4.62.0807241233190.16518@harper.uchicago.edu>
- In-Reply-To
- <20080724165434.GA26660@glandium.org>
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 use "echo" instead.
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> --- Mike Hommey wrote:
>>>> + test -z "$(ls .git/BISECT_*)" && >>> That is still a useless use of ls ;) >> It is much better than what I wrote, at least. > But could also be written with echo instead of ls.
How about this? (The echo is necessary because the argument to a case statement does not undergo filename expansion.)
t/t6030-bisect-porcelain.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 0626544..b6841fe 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_* && + case $(echo .git/BISECT_*) in *\*) ;; *) false ;; esac && git bisect start && test_must_fail git bisect good foo $HASH1 && test_must_fail git bisect good $HASH1 bar &&
-- 1.5.6.3.549.g8ca11