Thread (12 messages) flat view 12 messages, 4 authors, 2016-06-15
STALE3725d

[PATCH v3] t6030 (bisect): work around Mac OS X "ls"

From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:45:00
Subsystem: the rest · Maintainer: Linus Torvalds

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 <redacted>
---
 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help