diff options
| author |  Alex Henrie <alexhenrie24@gmail.com> | 2017-03-23 23:46:31 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-03-24 10:38:43 -0700 |
| commit | 940a911f8ec00e291a66c2d1ed05293a38ae6138 (patch) | |
| tree | cf74ecf92d0ba353999220c2dbb07fc65ccfdde4 /builtin | |
| parent | Sync with 2.12.1 (diff) | |
| download | tgif-940a911f8ec00e291a66c2d1ed05293a38ae6138.tar.xz | |
log: if --decorate is not given, default to --decorate=auto
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/log.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index 281af8c1ec..d755a59600 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -52,6 +52,11 @@ struct line_opt_callback_data { struct string_list args; }; +static int auto_decoration_style(void) +{ + return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0; +} + static int parse_decoration_style(const char *var, const char *value) { switch (git_config_maybe_bool(var, value)) { @@ -67,7 +72,7 @@ static int parse_decoration_style(const char *var, const char *value) else if (!strcmp(value, "short")) return DECORATE_SHORT_REFS; else if (!strcmp(value, "auto")) - return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0; + return auto_decoration_style(); return -1; } @@ -405,6 +410,8 @@ 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); |