]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t1308: relax the test verifying that empty alias values are disallowed
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 14 Jun 2017 11:35:53 +0000 (13:35 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Jun 2017 19:31:43 +0000 (12:31 -0700)
We are about to change the way aliases are expanded, to use the early
config machinery.

This machinery reports errors in a slightly different manner than the
cached config machinery.

Let's not get hung up by the precise wording of the message mentioning
the line number. It is really sufficient to verify that all the relevant
information is given to the user.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t1308-config-set.sh

index ff50960ccaed9953c5738c9bbf602bf0d326e15a..69a0aa56d6d7b759e71a57d24b838fe21a544777 100755 (executable)
@@ -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' '