diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-20 12:23:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-20 12:23:48 -0700 |
| commit | b94657683996402228abb1694a5db4792c424f9e (patch) | |
| tree | a553b8703be639bf1af8c74946337a5ebe08529f /builtin/clean.c | |
| parent | b67588d018441d1485378a7d9b460401ba8b76a5 (diff) | |
| parent | f6c5a2968c103621adf6928a29e4895361eaa23b (diff) | |
| download | git-b94657683996402228abb1694a5db4792c424f9e.tar.gz | |
Merge branch 'jn/parse-config-slot'
Code cleanup.
* 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 c35505ee6b..77846762b5 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -117,8 +117,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")) { |