Merge branch 'jc/cutoff-config'

diff --git a/t/t6134-pathspec-in-submodule.sh b/t/t6134-pathspec-in-submodule.sh
index 99a8982ab1554c6c2324402f78f46954445596fd..c670668409817c6d1066de53dc294bade2f27e93 100755 (executable)
--- a/t/t6134-pathspec-in-submodule.sh
+++ b/t/t6134-pathspec-in-submodule.sh
@@ -24,13 +24,9 @@ test_expect_success 'error message for path inside submodule' '
        test_i18ncmp expect actual
 '
 
-cat <<EOF >expect
-fatal: Pathspec '.' is in submodule 'sub'
-EOF
-
 test_expect_success 'error message for path inside submodule from within submodule' '
        test_must_fail git -C sub add . 2>actual &&
-       test_i18ncmp expect actual
+       test_i18ngrep "in unpopulated submodule" actual
 '
 
 test_done