undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ah/log-decorate-default-to-auto'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2017-05-23 13:46:02 +09:00
commit bf32fc5664
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/log.c
View File

@ -110,6 +110,8 @@ static void init_log_defaults(void)
{ {
init_grep_defaults(); init_grep_defaults();
init_diff_ui_defaults(); init_diff_ui_defaults();
decoration_style = auto_decoration_style();
} }
static void cmd_log_init_defaults(struct rev_info *rev) 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) if (decoration_style < 0)
decoration_style = 0; /* maybe warn? */ decoration_style = 0; /* maybe warn? */
return 0; return 0;
} else {
decoration_style = auto_decoration_style();
} }
if (!strcmp(var, "log.showroot")) { if (!strcmp(var, "log.showroot")) {
default_show_root = git_config_bool(var, value); default_show_root = git_config_bool(var, value);

12
t/t4202-log.sh
View File

@ -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' ' test_expect_success TTY 'log output on a TTY' '
git log --oneline --decorate >expect.short && git log --oneline --decorate >expect.short &&