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 /diff.c | |
parent | Merge branch 'rs/receive-pack-argv-leak-fix' (diff) | |
parent | color_parse: do not mention variable name in error message (diff) | |
download | tgif-b94657683996402228abb1694a5db4792c424f9e.tar.xz |
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 'diff.c')
-rw-r--r-- | diff.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -248,8 +248,7 @@ int git_diff_basic_config(const char *var, const char *value, void *cb) return 0; if (!value) return config_error_nonbool(var); - color_parse(value, var, diff_colors[slot]); - return 0; + return color_parse(value, diff_colors[slot]); } /* like GNU diff's --suppress-blank-empty option */ |