diff options
| author | Jeff King <peff@peff.net> | 2014-11-10 01:51:39 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-10 10:43:12 -0800 |
| commit | 899e06c3a5c394cf30768ada324381b701a88805 (patch) | |
| tree | 32c72dfcd5cb31765bdfd3128c39419e6c0cad15 | |
| parent | 9494ebc0fb871e0f96c5beba9e05e557eb239560 (diff) | |
| download | git-tr/remerge-diff.tar.gz | |
t4213: avoid "|" in sed regexptr/remerge-diff
Many versions of sed (e.g., that found on OS X) do not understand
"|"-alternation, even when backslash escaped. Some versions can turn on
extended regexps with a special option, but of course that option is not
standard, either. Let's just write out our alternates longhand.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t4213-log-remerge-diff.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t4213-log-remerge-diff.sh b/t/t4213-log-remerge-diff.sh index 36ef17a43b..ec93b96680 100755 --- a/t/t4213-log-remerge-diff.sh +++ b/t/t4213-log-remerge-diff.sh @@ -75,7 +75,9 @@ test_expect_success 'unrelated merge: without conflicts' ' clean_output () { git name-rev --name-only --stdin | # strip away bits that aren't treated by the above - sed -e 's/^\(index\|Merge:\|Date:\).*/\1/' + sed -e 's/^\(index\).*/\1/' \ + -e 's/^\(Merge:\).*/\1/' \ + -e 's/^\(Date:\).*/\1/' } cat >expected <<EOF |