So here is the fifth and hopefully the final try. Previous round
are at $gmane/289694, $gmane/289166, $gmane/288987 and
$gmane/290222.
This round is different from v4 in the following ways.
* wording changes, grammo- and typo-fixes in the documentation
(thanks to Eric Sunshine and Jeff King).
* v4 made --pretty=$fmt to override an earlier --expand-tabs=;
this round only allows --pretty=$fmt to set the default behaviour
when an explicit --expand-tabs= is given on the command line
(thanks to Jeff King).
* comes with a test.
See the end of this cover letter for an interdiff.
Junio C Hamano (3):
pretty: enable --expand-tabs by default for selected pretty formats
pretty: allow tweaking tabwidth in --expand-tabs
pretty: test --expand-tabs
Linus Torvalds (1):
pretty: expand tabs in indented logs to make things line up properly
Documentation/pretty-options.txt | 14 ++
builtin/log.c| 1 +
commit.h | 1 +
log-tree.c | 1 +
pretty.c | 90
revision.c | 14 ++
revision.h | 2 +
t/t4201-shortlog.sh | 2 +-
t/t4213-log-tabexpand.sh | 98
9 files changed, 213 insertions(+), 10 deletions(-)
create mode 100755 t/t4213-log-tabexpand.sh
--
2.8.1-251-g9997610
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index 8a944b1..93ad1cd 100644
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -45,16 +45,16 @@ people using 80-column terminals.
--expand-tabs=::
--expand-tabs::
--no-expand-tabs::
- Perform a tab expansion (replace each tab with enough number
- of spaces to fill to the next display column that is
- multiple of '') in the log message before using the message
- to show in the output. `--expand-tabs` is a short-hand for
- `--expand-tabs=8`, and `--no-expand-tabs` is a short-hand for
- `--expand-tabs=0`, which disables tab expansion.
+ Perform a tab expansion (replace each tab with enough spaces
+ to fill to the next display column that is multiple of '')
+ in the log message before showing it in the output.
+ `--expand-tabs` is a short-hand for `--expand-tabs=8`, and
+ `--no-expand-tabs` is a short-hand for `--expand-tabs=0`,
+ which disables tab expansion.
+
By default, tabs are expanded in pretty formats that indent the log
message by 4 spaces (i.e. 'medium', which is the default, 'full',
-and "fuller').
+and 'fuller').
ifndef::git-rev-list[]
--notes[=]::
diff --git a/builtin/log.c b/builtin/log.c
index e00cea7..e5775ae 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;
diff --git a/commit.h b/commit.h
index 2185c8d..b06db4d 100644
--- a/commit.h
+++ b/commit.h
@@ -147,7 +147,7 @@ struct pretty_print_context {
int preserve_subject;
struct date_mode date_mode;
unsigned date_mode_explicit:1;
- unsigned expand_tabs_in_log;
+ int expand_tabs_in_log;
int need_8bit_cte;
char *notes_message;
struct reflog_walk_info *reflog_info;
diff --git a/pretty.c b/pretty.c
index b340ecd..87c4497 100644
--- a/pretty.c
+++ b/pretty.c
@@ -173,7 +173,7 @@ void get_commit_format(const char *arg, struct rev_info
*rev)
rev->commit_format = commit_format->format;
rev->use_terminator = commit_format->is_tformat;
- rev->expand_tabs_in_log = commit_format->expand_tabs_in_log;
+ rev->expand_tabs_in_log_default = commit_format->expand_tabs_in_log;
if (commit_format->format == CMIT_FMT_USERFORMAT) {
save_user_format(rev, commit_format->user_format,
commit_format->is_tformat);
@@ -1722,6 +1722,9 @@ void pp_remainder(struct pretty_print_context *pp,
strbuf_grow(sb, linelen + indent + 20);
if (indent)
pp_handle_indent(pp, sb, indent, line, linelen);
+ else if (pp->expand_tabs_in_log)
+ strbuf_add_tabexpand(sb, pp->expand_tabs_in_log,
+line, linelen);
else
strbuf_add(sb, line, linelen);
strbuf_addch(sb, '\n');
diff --git a/revision.c b/revision.c
index 4f9ecbe..47e9ee7 100644
--- a/revision.c
+++ b/revision.c
@@ -1412,9 +1412,10 @@ void init_revisions(struct rev_info *revs, const char
*prefix)
revs->skip_count = -1;
revs->max_count = -1;
