mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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>
This commit is contained in:
parent
144126abf9
commit
7ee906694c
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue