diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-11 21:33:25 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-11 21:33:25 +0400 |
| commit | 7f346e9d73e75871d525664f36b7a5166b4feaf3 (patch) | |
| tree | 23ed0c98c3e379888f2d16e8d8dfd31468637ec0 /t | |
| parent | 0c72b98f31bf6eabd75be565a08ffcf0d8e74b1f (diff) | |
| parent | 8a7b034d6d451491dbcfaebc3d4ed4f08c756822 (diff) | |
Merge branch 'ta/config-set-1'
Use the new caching config-set API in git_config() calls.
* ta/config-set-1:
add tests for `git_config_get_string_const()`
add a test for semantic errors in config files
rewrite git_config() to use the config-set API
config: add `git_die_config()` to the config-set API
change `git_config()` return value to void
add line number and file name info to `config_set`
config.c: fix accuracy of line number in errors
config.c: mark error and warnings strings for translation
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1308-config-set.sh | 21 | ||||
| -rwxr-xr-x | t/t4055-diff-context.sh | 2 |
2 files changed, 22 insertions, 1 deletions
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh index 7fdf840b00..ea0bce2dc6 100755 --- a/t/t1308-config-set.sh +++ b/t/t1308-config-set.sh @@ -119,6 +119,16 @@ test_expect_success 'find integer value for a key' ' check_config get_int lamb.chop 65 ' +test_expect_success 'find string value for a key' ' + check_config get_string case.baz hask && + check_config expect_code 1 get_string case.ba "Value not found for \"case.ba\"" +' + +test_expect_success 'check line error when NULL string is queried' ' + test_expect_code 128 test-config get_string case.foo 2>result && + test_i18ngrep "fatal: .*case\.foo.*\.git/config.*line 7" result +' + test_expect_success 'find integer if value is non parse-able' ' check_config expect_code 128 get_int lamb.head ' @@ -197,4 +207,15 @@ test_expect_success 'proper error on error in custom config files' ' test_cmp expect actual ' +test_expect_success 'check line errors for malformed values' ' + mv .git/config .git/config.old && + test_when_finished "mv .git/config.old .git/config" && + cat >.git/config <<-\EOF && + [alias] + br + EOF + test_expect_code 128 git br 2>result && + test_i18ngrep "fatal: .*alias\.br.*\.git/config.*line 2" result +' + test_done diff --git a/t/t4055-diff-context.sh b/t/t4055-diff-context.sh index cd0454356a..741e0803c1 100755 --- a/t/t4055-diff-context.sh +++ b/t/t4055-diff-context.sh @@ -79,7 +79,7 @@ test_expect_success 'non-integer config parsing' ' test_expect_success 'negative integer config parsing' ' git config diff.context -1 && test_must_fail git diff 2>output && - test_i18ngrep "bad config file" output + test_i18ngrep "bad config variable" output ' test_expect_success '-U0 is valid, so is diff.context=0' ' |