Merge branch 'mt/submodule-reference'

diff --git a/t/t8005-blame-i18n.sh b/t/t8005-blame-i18n.sh
index 4470a92bb235420a2a0123eca5b57e06039ff011..fcd5c266754a2b5de3dbbf94c8ef25aebff061f2 100755 (executable)
--- a/t/t8005-blame-i18n.sh
+++ b/t/t8005-blame-i18n.sh
@@ -36,7 +36,7 @@ EOF
 test_expect_success \
        'blame respects i18n.commitencoding' '
        git blame --incremental file | \
-               grep "^\(author\|summary\) " > actual &&
+               egrep "^(author|summary) " > actual &&
        test_cmp actual expected
 '
 
@@ -53,7 +53,7 @@ test_expect_success \
        'blame respects i18n.logoutputencoding' '
        git config i18n.logoutputencoding cp1251 &&
        git blame --incremental file | \
-               grep "^\(author\|summary\) " > actual &&
+               egrep "^(author|summary) " > actual &&
        test_cmp actual expected
 '
 
@@ -69,7 +69,7 @@ EOF
 test_expect_success \
        'blame respects --encoding=utf-8' '
        git blame --incremental --encoding=utf-8 file | \
-               grep "^\(author\|summary\) " > actual &&
+               egrep "^(author|summary) " > actual &&
        test_cmp actual expected
 '
 
@@ -85,7 +85,7 @@ EOF
 test_expect_success \
        'blame respects --encoding=none' '
        git blame --incremental --encoding=none file | \
-               grep "^\(author\|summary\) " > actual &&
+               egrep "^(author|summary) " > actual &&
        test_cmp actual expected
 '