summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-20 19:23:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-20 19:23:48 (GMT)
commitb94657683996402228abb1694a5db4792c424f9e (patch)
treea553b8703be639bf1af8c74946337a5ebe08529f /builtin/log.c
parentb67588d018441d1485378a7d9b460401ba8b76a5 (diff)
parentf6c5a2968c103621adf6928a29e4895361eaa23b (diff)
downloadgit-b94657683996402228abb1694a5db4792c424f9e.zip
git-b94657683996402228abb1694a5db4792c424f9e.tar.gz
git-b94657683996402228abb1694a5db4792c424f9e.tar.bz2
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 1202eba..68d5d30 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;