Skip to content

Commit e4feff4

Browse files
dschogitster
authored andcommitted
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>
1 parent 659fef1 commit e4feff4

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

t/t1308-config-set.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,9 @@ test_expect_success 'check line errors for malformed values' '
215215
br
216216
EOF
217217
test_expect_code 128 git br 2>result &&
218-
test_i18ngrep "fatal: .*alias\.br.*\.git/config.*line 2" result
218+
test_i18ngrep "missing value for .alias\.br" result &&
219+
test_i18ngrep "fatal: .*\.git/config" result &&
220+
test_i18ngrep "fatal: .*line 2" result
219221
'
220222

221223
test_expect_success 'error on modifying repo config without repo' '

0 commit comments

Comments
 (0)