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 look at > its output instead. > > Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxxxxx> Acked-by: Christian Couder <chriscool@xxxxxxxxxxxxx> Thanks, Christian. > --- > > Mike Hommey wrote: > > On Thu, Jul 24, 2008 at 07:57:26AM +0200, Christian Couder wrote: > >> Le jeudi 24 juillet 2008, Jonathan Nieder a écrit : > >>> - 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 ;) > > It is much better than what I wrote, at least. > > Good night (well, good morning I guess), and thanks. > > 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 && -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
