diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-06 23:38:28 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-06 23:38:29 +0300 |
| commit | 87daf40750c9e344dd50495fdca1809aebcb1a94 (patch) | |
| tree | 3f08482461e3484d5e77c7575c3fa35af28a33a4 /builtin/log.c | |
| parent | e9dffbc7f11704bd25e5a36e41e5fe5c5d1f7183 (diff) | |
| parent | 3611f7467fddcff6063ed2c99484047b410969fc (diff) | |
Merge branch 'ab/config-multi-and-nonbool'
Assorted config API updates.
* ab/config-multi-and-nonbool:
for-each-repo: with bad config, don't conflate <path> and <cmd>
config API: add "string" version of *_value_multi(), fix segfaults
config API users: test for *_get_value_multi() segfaults
for-each-repo: error on bad --config
config API: have *_multi() return an "int" and take a "dest"
versioncmp.c: refactor config reading next commit
config API: add and use a "git_config_get()" family of functions
config tests: add "NULL" tests for *_get_value_multi()
config tests: cover blind spots in git_die_config() tests
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/log.c b/builtin/log.c index 4693385e8e..0c6556b2d7 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -185,10 +185,10 @@ static void set_default_decoration_filter(struct decoration_filter *decoration_f int i; char *value = NULL; struct string_list *include = decoration_filter->include_ref_pattern; - const struct string_list *config_exclude = - git_config_get_value_multi("log.excludeDecoration"); + const struct string_list *config_exclude; - if (config_exclude) { + if (!git_config_get_string_multi("log.excludeDecoration", + &config_exclude)) { struct string_list_item *item; for_each_string_list_item(item, config_exclude) string_list_append(decoration_filter->exclude_ref_config_pattern, |