From: Jonathan Nieder <jrnieder@uchicago.edu>
To: git@vger.kernel.org
Cc: Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH] t6030 (bisect): work around Mac OS X "ls"
Date: Wed, 23 Jul 2008 20:37:35 -0500 (CDT) [thread overview]
Message-ID: <Pine.GSO.4.62.0807232014030.14945@harper.uchicago.edu> (raw)
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
<shell glob pattern>" and grep instead.
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
---
With this change, all the non-git-svn tests pass on my machine.
I think the fix is portable but I do not have the experience to
be sure. So I would be happier if someone looks it over.
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..d19fc1c 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_* &&
+ echo .git/BISECT_* | test_must_fail grep BISECT_[^*] &&
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
next reply other threads:[~2008-07-24 1:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-24 1:37 Jonathan Nieder [this message]
2008-07-24 5:57 ` [PATCH] t6030 (bisect): work around Mac OS X "ls" Christian Couder
2008-07-24 6:06 ` Mike Hommey
2008-07-24 7:43 ` [PATCH v2] " Jonathan Nieder
2008-07-24 16:54 ` Mike Hommey
2008-07-24 17:44 ` Johannes Schindelin
2008-07-24 17:51 ` [PATCH v3] " Jonathan Nieder
2008-07-24 18:16 ` Jonathan Nieder
2008-07-27 3:19 ` [PATCH v2] " Christian Couder
2008-07-27 4:04 ` Christian Couder
2008-07-27 4:53 ` Jonathan Nieder
2008-07-27 5:10 ` Christian Couder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.GSO.4.62.0807232014030.14945@harper.uchicago.edu \
--to=jrnieder@uchicago.edu \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).