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>
Junio C Hamano committed
Jan 4, 2008 at 22:22 UTC
7ee906694c28ab7281492d5114d2afabd964bd41
1 file changed
+2
-2
t/t7600-merge.sh
+2
-2
@@ -371,7 +371,7 @@ test_expect_success 'override config option -n' '
371
git merge --summary c2 >diffstat.txt &&
372
verify_merge file result.1-5 msg.1-5 &&
373
verify_parents $c1 $c2 &&
374
- if ! grep -e "^ file | \+2 +-$" diffstat.txt
374
+ if ! grep -e "^ file | *2 +-$" diffstat.txt
375
then
376
echo "[OOPS] diffstat was not generated"
377
fi
@@ -386,7 +386,7 @@ test_expect_success 'override config option --summary' '
386
git merge -n c2 >diffstat.txt &&
387
verify_merge file result.1-5 msg.1-5 &&
388
verify_parents $c1 $c2 &&
389
- if grep -e "^ file | \+2 +-$" diffstat.txt
389
+ if grep -e "^ file | *2 +-$" diffstat.txt
390
then
391
echo "[OOPS] diffstat was generated"
392
false