Re: [PATCH] t6030 (bisect): work around Mac OS X "ls"
On Thu, Jul 24, 2008 at 07:57:26AM +0200, Christian Couder wrote:
Show 29 quoted lines
> Le jeudi 24 juillet 2008, Jonathan Nieder a écrit :
> > 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_[^*] &&
>
> Perhaps the following is simpler:
>
> + test -z "$(ls .git/BISECT_*)" &&
That is still a useless use of ls ;)
Mike