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

Merge branch 'lt/log-auto-decorate'

Browse Source 
* lt/log-auto-decorate:
  git log: support "auto" decorations
This commit is contained in:
Junio C Hamano 2014-06-16 12:18:41 -07:00
commit 3009afd54e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/log.c
View File

@ -63,6 +63,8 @@ static int parse_decoration_style(const char *var, const char *value)
return DECORATE_FULL_REFS; return DECORATE_FULL_REFS;
else if (!strcmp(value, "short")) else if (!strcmp(value, "short"))
return DECORATE_SHORT_REFS; return DECORATE_SHORT_REFS;
else if (!strcmp(value, "auto"))
return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0;
return -1; return -1;
} }