summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-23 04:46:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-23 04:46:03 (GMT)
commitbf32fc5664a1946028a93859005600a70ee1c660 (patch)
tree036441bfaf459eb9b45155f6d7c222920bb70d74
parentbea1579b80f3e72f44f13dc20398e71b333af2a8 (diff)
parentc74271aae74c951ab321aa16fe573ea3bcab86ba (diff)
downloadgit-bf32fc5664a1946028a93859005600a70ee1c660.zip
git-bf32fc5664a1946028a93859005600a70ee1c660.tar.gz
git-bf32fc5664a1946028a93859005600a70ee1c660.tar.bz2
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
-rw-r--r--builtin/log.c4
-rwxr-xr-xt/t4202-log.sh12
2 files changed, 14 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c
index fd3d10e..631fbc9 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);
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index f577990..1c7d672 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -577,6 +577,18 @@ test_expect_success 'log.decorate configuration' '
'
+test_expect_success 'log.decorate config parsing' '
+ git log --oneline --decorate=full >expect.full &&
+ git log --oneline --decorate=short >expect.short &&
+
+ test_config log.decorate full &&
+ test_config log.mailmap true &&
+ git log --oneline >actual &&
+ test_cmp expect.full actual &&
+ git log --oneline --decorate=short >actual &&
+ test_cmp expect.short actual
+'
+
test_expect_success TTY 'log output on a TTY' '
git log --oneline --decorate >expect.short &&