summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 80a3f53)
raw | patch | inline | side by side (parent: 80a3f53)
author | Thomas Rast <trast@inf.ethz.ch> | |
Tue, 6 Mar 2012 14:50:37 +0000 (15:50 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 6 Mar 2012 20:32:24 +0000 (12:32 -0800) |
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>
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>
t/t5704-bundle.sh | patch | blob | history |
diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh
index a51c8b0560f85d31dc73d40a58ae3e4c6655f140..9e43731fe504c46737c5294e4d508b5c20bbb663 100755 (executable)
--- a/t/t5704-bundle.sh
+++ b/t/t5704-bundle.sh
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