summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2017-06-14 11:35:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-15 19:31:43 (GMT)
commite4feff4898f4705cc8df50e3dc152ed45ef06db6 (patch)
treeec9b1e4213f5bb8d095e36c800966c3efb2a271f
parent659fef199fb52d4a5cb24f1dfd2b272980fc5038 (diff)
downloadgit-e4feff4898f4705cc8df50e3dc152ed45ef06db6.zip
git-e4feff4898f4705cc8df50e3dc152ed45ef06db6.tar.gz
git-e4feff4898f4705cc8df50e3dc152ed45ef06db6.tar.bz2
t1308: relax the test verifying that empty alias values are disallowed
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>
-rwxr-xr-xt/t1308-config-set.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index ff50960..69a0aa5 100755
--- 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' '