diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-29 15:49:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-30 12:39:29 -0700 |
| commit | 0893eec85fca0f76039a96cbbcd3592ff8571c24 (patch) | |
| tree | 2be9e1683a91699d45472fe1b0d899c864a37558 /revision.h | |
| parent | 7cc13c717b52d3539e76f087d747f96d0d24a914 (diff) | |
| download | git-0893eec85fca0f76039a96cbbcd3592ff8571c24.tar.gz | |
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 'revision.h')
| -rw-r--r-- | revision.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/revision.h b/revision.h index 40797535fa..6cc36b49c5 100644 --- a/revision.h +++ b/revision.h @@ -133,7 +133,6 @@ struct rev_info { show_notes_given:1, show_signature:1, pretty_given:1, - expand_tabs_in_log:1, abbrev_commit:1, abbrev_commit_given:1, zero_commit:1, @@ -149,6 +148,8 @@ struct rev_info { linear:1; struct date_mode date_mode; + int expand_tabs_in_log; /* unset if negative */ + int expand_tabs_in_log_default; unsigned int abbrev; enum cmit_fmt commit_format; |