Re: [ANNOUNCE] Git 1.7.9.3
- From
Thomas Rast <trast@inf.ethz.ch>
- Date
- Mar 6, 2012, 14:50 UTC
- Message-ID
- <87y5rd4wci.fsf@thomas.inf.ethz.ch>
- In-Reply-To
- <A518E7E7-25D5-429C-A1C1-35F94EC8F043@bjhargrave.com>
BJ Hargrave <bj@bjhargrave.com> writes:
Show 15 quoted lines
> ok 6 - empty bundle file is rejected
> not ok - 7 ridiculously long subject in boundary
> #
> # : >file4 &&
> # test_tick &&
> # git add file4 &&
> # printf "%01200d
> # " 0 | git commit -F - &&
> # test_commit fifth &&
> # git bundle create long-subject-bundle.bdl HEAD^..HEAD &&
> # git bundle list-heads long-subject-bundle.bdl >heads &&
> # test -s heads &&
> # git fetch long-subject-bundle.bdl &&
> # sed -n "/^-/{p;q}" long-subject-bundle.bdl >boundary &&
> # grep "^-$_x40 " boundaryI can reproduce this. The failure (to be seen from -v, which would have been really nice to have in the original mail):
sed: 1: "/^-/{p;q}": extra characters at the end of q commandThis can be fixed with the change below, which then gets us into the next one
grep: Regular expression too big
Sheesh, Apple, are you kidding me?! So we also need to change the grep expression.
----- 8< ----- Subject: [PATCH] t5704: fix nonportable sed/grep usages
OS X's sed and grep would complain with (respectively)
sed: 1: "/^-/{p;q}": extra characters at the end of q command
grep: Regular expression too bigFor sed, use an explicit ; to terminate the q command.
For grep, spell the "40 hex digits" explicitly in the regex, instead of being lazy with the shell pattern $_x40. --- t/t5704-bundle.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh index a51c8b0..9e43731 100755 --- a/t/t5704-bundle.sh +++ b/t/t5704-bundle.sh @@ -54,8 +54,8 @@ test_expect_success 'ridiculously long subject in boundary' ' git bundle list-heads long-subject-bundle.bdl >heads && test -s heads && git fetch long-subject-bundle.bdl && - sed -n "/^-/{p;q}" long-subject-bundle.bdl >boundary && - grep "^-$_x40 " boundary + sed -n "/^-/{p;q;}" long-subject-bundle.bdl >boundary && + grep "^-[0-9a-f]\\{40\\} " boundary ' test_done
--
1.7.6.557.gcee4
--
Thomas Rast
trast@{inf,student}.ethz.ch