Merge branch 'js/alias-early-config' into maint

diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index ff50960ccaed9953c5738c9bbf602bf0d326e15a..69a0aa56d6d7b759e71a57d24b838fe21a544777 100755 (executable)
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -215,7 +215,9 @@ test_expect_success 'check line errors for malformed values' '
                br
        EOF
        test_expect_code 128 git br 2>result &&
-       test_i18ngrep "fatal: .*alias\.br.*\.git/config.*line 2" result
+       test_i18ngrep "missing value for .alias\.br" result &&
+       test_i18ngrep "fatal: .*\.git/config" result &&
+       test_i18ngrep "fatal: .*line 2" result
 '
 
 test_expect_success 'error on modifying repo config without repo' '