diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-11-20 11:40:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-20 11:40:29 -0800 |
| commit | 62ce40d9338046a89de5d2bfb6b258872fd366c0 (patch) | |
| tree | caec918aacac7203a8d8c25145b412b9fed6a8cc /builtin/clean.c | |
| parent | t4026: test "normal" color (diff) | |
| parent | color_parse: do not mention variable name in error message (diff) | |
| download | tgif-62ce40d9338046a89de5d2bfb6b258872fd366c0.tar.xz | |
Merge branch 'jn/parse-config-slot' into jk/colors
* jn/parse-config-slot:
color_parse: do not mention variable name in error message
pass config slots as pointers instead of offsets
Diffstat (limited to 'builtin/clean.c')
| -rw-r--r-- | builtin/clean.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/clean.c b/builtin/clean.c index 3beeea6ec0..a7e7b0bf6a 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -116,8 +116,7 @@ static int git_clean_config(const char *var, const char *value, void *cb) return 0; if (!value) return config_error_nonbool(var); - color_parse(value, var, clean_colors[slot]); - return 0; + return color_parse(value, clean_colors[slot]); } if (!strcmp(var, "clean.requireforce")) { |