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@xxxxxxxxx> --- * I do not think these clean-ups are particularly necessary right now, but as we noticed it why not... t/t7600-merge.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) 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 -- 1.5.4.rc2.17.g257f - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
