Re: [PATCH] t/t7600: avoid GNUism in grep
From: Charles Bailey <hidden>
Date: 2016-06-15 22:44:02
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] t/t7600: avoid GNUism in grep · Junio C Hamano <hidden>
Junio C Hamano wrote:
quoted hunk ↗ jump to hunk
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 6424c6e..21862ac 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
I'm not sure that you quite made the change you meant to change in the second chunk ( ' +' vs. ' *' ? ). Charles.