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/log.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/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 4389722b4b..4c5fc4bff5 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -389,7 +389,7 @@ static int git_log_config(const char *var, const char *value, void *cb) return 0; } if (starts_with(var, "color.decorate.")) - return parse_decorate_color_config(var, 15, value); + return parse_decorate_color_config(var, var + 15, value); if (!strcmp(var, "log.mailmap")) { use_mailmap_config = git_config_bool(var, value); return 0; |