diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-30 01:49:24 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-30 22:39:29 +0300 |
| commit | 0893eec85fca0f76039a96cbbcd3592ff8571c24 (patch) | |
| tree | 2be9e1683a91699d45472fe1b0d899c864a37558 /t/t4201-shortlog.sh | |
| parent | 7cc13c717b52d3539e76f087d747f96d0d24a914 (diff) | |
pretty: enable --expand-tabs by default for selected pretty formats
"git log --pretty={medium,full,fuller}" and "git log" by default
prepend 4 spaces to the log message, so it makes sense to enable
the new "expand-tabs" facility by default for these formats.
Add --no-expand-tabs option to override the new default.
The change alone breaks a test in t4201 that runs "git shortlog"
on the output from "git log", and expects that the output from
"git log" does not do such a tab expansion. Adjust the test to
explicitly disable expand-tabs with --no-expand-tabs.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 7600a3e3e8..2fec94886a 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 ' |