diff options
| author | Lars Schneider <larsxschneider@gmail.com> | 2016-02-19 10:16:01 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 09:36:33 -0800 |
| commit | 473166b99078a2724b4fcda11a6a5327b9af60da (patch) | |
| tree | d20463aea79f73f32735816143441b67e7eca6a5 /t/t1308-config-set.sh | |
| parent | 7454ee3c623a6788d91fd3c97af134de33996cfa (diff) | |
| download | git-473166b99078a2724b4fcda11a6a5327b9af60da.tar.gz git-473166b99078a2724b4fcda11a6a5327b9af60da.tar.xz | |
config: add 'origin_type' to config_source struct
Use the config origin_type to print more detailed error messages that
inform the user about the origin of a config error (file, stdin, blob).
Helped-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1308-config-set.sh')
| -rwxr-xr-x | t/t1308-config-set.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh index 91235b76b..82f82a16d 100755 --- a/t/t1308-config-set.sh +++ b/t/t1308-config-set.sh @@ -195,14 +195,14 @@ test_expect_success 'proper error on error in default config files' ' cp .git/config .git/config.old && test_when_finished "mv .git/config.old .git/config" && echo "[" >>.git/config && - echo "fatal: bad config file line 34 in .git/config" >expect && + echo "fatal: bad config line 34 in file .git/config" >expect && test_expect_code 128 test-config get_value foo.bar 2>actual && test_cmp expect actual ' test_expect_success 'proper error on error in custom config files' ' echo "[" >>syntax-error && - echo "fatal: bad config file line 1 in syntax-error" >expect && + echo "fatal: bad config line 1 in file syntax-error" >expect && test_expect_code 128 test-config configset_get_value foo.bar syntax-error 2>actual && test_cmp expect actual ' |