diff options
| author | Thomas Rast <trast@inf.ethz.ch> | 2012-03-06 15:50:37 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-06 12:32:24 -0800 |
| commit | 0dbe6592ccbd1a394a69a52074e3729d546fe952 (patch) | |
| tree | 7a2a21fe054654bfcd73ee713655a437dbb226d9 | |
| parent | 80a3f53424b2e3d6d7b9463dbd3faa888ced947f (diff) | |
| download | git-0dbe6592ccbd1a394a69a52074e3729d546fe952.tar.gz | |
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 big
For sed, use an explicit ; to terminate the q command.
For grep, spell the "40 hex digits" explicitly in the regex, which
should be safe as other tests already use this and we haven't got
breakage reports on OS X about them.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | 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 a51c8b0560..9e43731fe5 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 |