diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-14 00:12:36 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-14 00:12:36 +0300 |
| commit | cafef3d7ad3ed58d9c976bdeb604cff6b4c1f82b (patch) | |
| tree | f16d708c5ce5391423a4747535bac46bbfb1c860 /t/t4201-shortlog.sh | |
| parent | 7c137bb5316fbd82e816c2dabebc1d347261c93e (diff) | |
| parent | 915c96df3822f968332f6bf3642e5195b52201c9 (diff) | |
Merge branch 'lt/pretty-expand-tabs'
When "git log" shows the log message indented by 4-spaces, the
remainder of a line after a HT does not align in the way the author
originally intended. The command now expands tabs by default in
such a case, and allows the users to override it with a new option,
'--no-expand-tabs'.
* lt/pretty-expand-tabs:
pretty: test --expand-tabs
pretty: allow tweaking tabwidth in --expand-tabs
pretty: enable --expand-tabs by default for selected pretty formats
pretty: expand tabs in indented logs to make things line up properly
Diffstat (limited to 't/t4201-shortlog.sh')
| -rwxr-xr-x | t/t4201-shortlog.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh index f5e63670fa..a9773658f0 100755 --- a/t/t4201-shortlog.sh +++ b/t/t4201-shortlog.sh @@ -115,7 +115,7 @@ EOF ' test_expect_success !MINGW 'shortlog from non-git directory' ' - git log HEAD >log && + git log --no-expand-tabs HEAD >log && GIT_DIR=non-existing git shortlog -w <log >out && test_cmp expect out ' |