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 /Documentation/merge-options.txt | |
parent | Merge branch 'maint-1.7.8' into maint (diff) | |
download | tgif-0dbe6592ccbd1a394a69a52074e3729d546fe952.tar.xz |
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>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions