From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 5 Jan 2008 06:22:55 +0000 (-0800)
Subject: t/t7600: avoid GNUism in grep
X-Git-Tag: v1.5.4-rc3~48
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7ee906694c28ab7281492d5114d2afabd964bd41;p=git.git

t/t7600: avoid GNUism in grep

Using \+ to mean "one or more" in grep without -E is a GNU
extension outside POSIX.  Avoid it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 6424c6e2c..50c51c82f 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -371,7 +371,7 @@ test_expect_success 'override config option -n' '
 	git merge --summary c2 >diffstat.txt &&
 	verify_merge file result.1-5 msg.1-5 &&
 	verify_parents $c1 $c2 &&
-	if ! grep -e "^ file | \+2 +-$" diffstat.txt
+	if ! grep -e "^ file |  *2 +-$" diffstat.txt
 	then
 		echo "[OOPS] diffstat was not generated"
 	fi
@@ -386,7 +386,7 @@ test_expect_success 'override config option --summary' '
 	git merge -n c2 >diffstat.txt &&
 	verify_merge file result.1-5 msg.1-5 &&
 	verify_parents $c1 $c2 &&
-	if grep -e "^ file | \+2 +-$" diffstat.txt
+	if grep -e "^ file |  *2 +-$" diffstat.txt
 	then
 		echo "[OOPS] diffstat was generated"
 		false