Re: [PATCH v2] t6030 (bisect): work around Mac OS X "ls"
- From
Christian Couder <chriscool@tuxfamily.org>
- Date
- Jul 27, 2008, 05:10 UTC
- Message-ID
- <200807270710.19974.chriscool@tuxfamily.org>
- In-Reply-To
- <Pine.GSO.4.62.0807262343510.426@harper.uchicago.edu>
Le dimanche 27 juillet 2008, Jonathan Nieder a écrit :
Show 16 quoted lines
> 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> > --- > > On Sun, 27 Jul 2008, Christian Couder wrote: > > It seems that there is a problem with the message itself though. When I > > "git am" it, I get: > > > > fatal: cannot convert from x-unknown to utf-8 > > Hmm, not sure what happened. Maybe resending it will work...
Yes, this one works fine.
Thanks, Christian.
Show 17 quoted lines
> > 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..244fda6 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_* && > + 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 &&