diff options
| author | Jeff King <peff@peff.net> | 2008-12-07 21:54:17 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-07 19:59:25 -0800 |
| commit | 5ec11af61d907311e4e1b21e10009b06dc2cf74a (patch) | |
| tree | 898c41036a30cab06466e64b95c27fee5f17529c /builtin-log.c | |
| parent | 63e8dc5b14b8b80c1a0138c73c875bd82b8b027d (diff) | |
| download | git-5ec11af61d907311e4e1b21e10009b06dc2cf74a.tar.gz git-5ec11af61d907311e4e1b21e10009b06dc2cf74a.tar.xz | |
reorder ALLOW_TEXTCONV option setting
Right now for the diff porcelain and the log family, we
call:
init_revisions();
setup_revisions();
DIFF_OPT_SET(ALLOW_TEXTCONV);
However, that means textconv will _always_ be on, instead of
being a default that can be manipulated with
setup_revisions. Instead, we want:
init_revisions();
DIFF_OPT_SET(ALLOW_TEXTCONV);
setup_revisions();
which is what this patch does.
We'll go ahead and move the callsite in wt-status, also;
even though the user can't pass any options here, it is a
cleanup that will help avoid any surprise later if the
setup_revisions line is changed.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-log.c')
| -rw-r--r-- | builtin-log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-log.c b/builtin-log.c index b16471737..840daf907 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -37,6 +37,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix, DIFF_OPT_SET(&rev->diffopt, RECURSIVE); rev->show_root_diff = default_show_root; rev->subject_prefix = fmt_patch_subject_prefix; + DIFF_OPT_SET(&rev->diffopt, ALLOW_TEXTCONV); if (default_date_mode) rev->date_mode = parse_date_format(default_date_mode); @@ -60,7 +61,6 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix, } else die("unrecognized argument: %s", arg); } - DIFF_OPT_SET(&rev->diffopt, ALLOW_TEXTCONV); } /* |