diff options
| author | René Scharfe <l.s.r@web.de> | 2014-10-04 20:54:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-07 11:09:16 -0700 |
| commit | e3f1da982e4f14e7146964cb25a5011a3f41e84a (patch) | |
| tree | 0b225c25e7b86a7a49b58f4fa4af500c5c36b40a /builtin/log.c | |
| parent | 565301e41670825ceedf75220f2918ae76831240 (diff) | |
| download | git-e3f1da982e4f14e7146964cb25a5011a3f41e84a.tar.gz | |
use skip_prefix() to avoid more magic numbersrs/more-uses-of-skip-prefix
Continue where ae021d87 (use skip_prefix to avoid magic numbers) left off
and use skip_prefix() in more places for determining the lengths of prefix
strings to avoid using dependent constants and other indirect methods.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c index 2fb34c7de9..1202eba8b6 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -368,6 +368,8 @@ static int cmd_log_walk(struct rev_info *rev) static int git_log_config(const char *var, const char *value, void *cb) { + const char *slot_name; + if (!strcmp(var, "format.pretty")) return git_config_string(&fmt_pretty, var, value); if (!strcmp(var, "format.subjectprefix")) @@ -388,8 +390,8 @@ static int git_log_config(const char *var, const char *value, void *cb) default_show_root = git_config_bool(var, value); return 0; } - if (starts_with(var, "color.decorate.")) - return parse_decorate_color_config(var, 15, value); + if (skip_prefix(var, "color.decorate.", &slot_name)) + return parse_decorate_color_config(var, slot_name - var, value); if (!strcmp(var, "log.mailmap")) { use_mailmap_config = git_config_bool(var, value); return 0; |