From 899e06c3a5c394cf30768ada324381b701a88805 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 10 Nov 2014 01:51:39 -0500 Subject: t4213: avoid "|" in sed regexp 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 Signed-off-by: Junio C Hamano --- t/t4213-log-remerge-diff.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 <