diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-06-04 10:20:57 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-04 10:20:57 +0900 |
commit | fb11de9ef58305a3dce6ebaaf53cc8c7ff9c5231 (patch) | |
tree | 6a940ab652f29142b7d11add8bd632d358af843b /builtin/log.c | |
parent | 6c940eb94d8c6ed75413826e067df78f30b5707f (diff) | |
parent | c74271aae74c951ab321aa16fe573ea3bcab86ba (diff) | |
download | git-fb11de9ef58305a3dce6ebaaf53cc8c7ff9c5231.tar.gz |
Merge branch 'ah/log-decorate-default-to-auto' into maint
Setting "log.decorate=false" in the configuration file did not take
effect in v2.13, which has been corrected.
* ah/log-decorate-default-to-auto:
builtin/log: honor log.decorate
Diffstat (limited to 'builtin/log.c')
-rw-r--r-- | builtin/log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c index b3b10cc1ed..ec3258368c 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -110,6 +110,8 @@ static void init_log_defaults(void) { init_grep_defaults(); init_diff_ui_defaults(); + + decoration_style = auto_decoration_style(); } static void cmd_log_init_defaults(struct rev_info *rev) @@ -410,8 +412,6 @@ static int git_log_config(const char *var, const char *value, void *cb) if (decoration_style < 0) decoration_style = 0; /* maybe warn? */ return 0; - } else { - decoration_style = auto_decoration_style(); } if (!strcmp(var, "log.showroot")) { default_show_root = git_config_bool(var, value); |