diff options
| author | Jeff King <peff@peff.net> | 2013-09-08 04:38:22 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-09 11:07:07 -0700 |
| commit | 2f666581bbc1895cf66a7007fb222026b299deb9 (patch) | |
| tree | 7a5dd7bdbfc6f99a060ec263330a21184c26a34a /t/t1300-repo-config.sh | |
| parent | 33fdd77e2b8ece3490982f9a35c8669d16879ba8 (diff) | |
| download | git-2f666581bbc1895cf66a7007fb222026b299deb9.tar.gz git-2f666581bbc1895cf66a7007fb222026b299deb9.tar.xz | |
config: make numeric parsing errors more clear
If we try to parse an integer config argument and get a
number outside of the representable range, we die with the
cryptic message: "bad config value for '%s'".
We can improve two things:
1. Show the value that produced the error (e.g., bad
config value '3g' for 'foo.bar').
2. Mention the reason the value was rejected (e.g.,
"invalid unit" versus "out of range").
A few tests need to be updated with the new output, but that
should not be representative of real-world breakage, as
scripts should not be depending on the exact text of our
stderr output, which is subject to i18n anyway.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1300-repo-config.sh')
| -rwxr-xr-x | t/t1300-repo-config.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index c4a7d84f4..20aee6e17 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -657,11 +657,11 @@ test_expect_success 'invalid unit' ' echo 1auto >expect && git config aninvalid.unit >actual && test_cmp expect actual && - cat > expect <<-\EOF - fatal: bad config value for '\''aninvalid.unit'\'' in .git/config + cat >expect <<-\EOF + fatal: bad numeric config value '\''1auto'\'' for '\''aninvalid.unit'\'' in .git/config: invalid unit EOF test_must_fail git config --int --get aninvalid.unit 2>actual && - test_cmp actual expect + test_i18ncmp expect actual ' cat > expect << EOF |