diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-23 13:46:02 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-23 13:46:03 +0900 |
| commit | bf32fc5664a1946028a93859005600a70ee1c660 (patch) | |
| tree | 036441bfaf459eb9b45155f6d7c222920bb70d74 /builtin/log.c | |
| parent | bea1579b80f3e72f44f13dc20398e71b333af2a8 (diff) | |
| parent | c74271aae74c951ab321aa16fe573ea3bcab86ba (diff) | |
| download | git-bf32fc5664a1946028a93859005600a70ee1c660.tar.gz | |
Merge branch 'ah/log-decorate-default-to-auto'
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 fd3d10ec21..631fbc984f 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); |