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 /builtin/log.c | |
| parent | pretty: expand tabs in indented logs to make things line up properly (diff) | |
| download | tgif-0893eec85fca0f76039a96cbbcd3592ff8571c24.tar.xz | |
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 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c index e00cea75cc..e5775ae4d1 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1281,6 +1281,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) git_config(git_format_config, NULL); init_revisions(&rev, prefix); rev.commit_format = CMIT_FMT_EMAIL; + rev.expand_tabs_in_log_default = 0; rev.verbose_header = 1; rev.diff = 1; rev.max_parents = 1; |