diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-20 21:23:48 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-20 21:23:48 +0200 |
| commit | b94657683996402228abb1694a5db4792c424f9e (patch) | |
| tree | a553b8703be639bf1af8c74946337a5ebe08529f /builtin/log.c | |
| parent | Merge branch 'rs/receive-pack-argv-leak-fix' (diff) | |
| parent | color_parse: do not mention variable name in error message (diff) | |
| download | git-b94657683996402228abb1694a5db4792c424f9e.tar.xz git-b94657683996402228abb1694a5db4792c424f9e.zip | |
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/log.c')
| -rw-r--r-- | builtin/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index 1202eba8b6..68d5d30035 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -391,7 +391,7 @@ static int git_log_config(const char *var, const char *value, void *cb) return 0; } if (skip_prefix(var, "color.decorate.", &slot_name)) - return parse_decorate_color_config(var, slot_name - var, value); + return parse_decorate_color_config(var, slot_name, value); if (!strcmp(var, "log.mailmap")) { use_mailmap_config = git_config_bool(var, value); return 0; |