On 10/30, Brandon Williams wrote:
> On 10/30, Stefan Beller wrote:
> > On Mon, Oct 30, 2017 at 12:46 PM, Brandon Williams <[email protected]>
> > wrote:
> > > git-show is unique in that it wants to use textconv by default except
> > > for when it is showing blobs. When asked to show a blob, show doesn't
> > > want to use textconv unless the user explicitly requested that it be
> > > used by providing the command line flag '--textconv'.
> > >
> > > Currently this is done by using a parallel set of 'touched' flags which
> > > get set every time a particular flag is set or cleared. In a future
> > > patch we want to eliminate this parallel set of flags so instead of
> > > relying on if the textconv flag has been touched, add a new flag
> > > 'TEXTCONV_SET_VIA_CMDLINE' which is only set if textconv is requested
> > > via the command line.
> >
> > Is it worth mentioning 4197361e39 (Merge branch 'mg/more-textconv',
> > 2013-10-23), that introduced the touched_flags?
> > (+cc Michael Gruber FYI)
> >
> > > Signed-off-by: Brandon Williams <[email protected]>
> > > ---
> > > builtin/log.c | 2 +-
> > > diff.c | 8 +++++---
> > > diff.h | 1 +
> > > 3 files changed, 7 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/builtin/log.c b/builtin/log.c
> > > index dc28d43eb..82131751d 100644
> > > --- a/builtin/log.c
> > > +++ b/builtin/log.c
> > > @@ -485,7 +485,7 @@ static int show_blob_object(const struct object_id
> > > *oid, struct rev_info *rev, c
> > > unsigned long size;
> > >
> > > fflush(rev->diffopt.file);
> > > - if (!DIFF_OPT_TOUCHED(&rev->diffopt, ALLOW_TEXTCONV) ||
> > > + if (!DIFF_OPT_TST(&rev->diffopt, TEXTCONV_SET_VIA_CMDLINE) ||
> > > !DIFF_OPT_TST(&rev->diffopt, ALLOW_TEXTCONV))
> > > return stream_blob_to_fd(1, oid, NULL, 0);
> > >
> > > diff --git a/diff.c b/diff.c
> > > index 3ad9c9b31..8b700b1bd 100644
> > > --- a/diff.c
> > > +++ b/diff.c
> > > @@ -4762,11 +4762,13 @@ int diff_opt_parse(struct diff_options *options,
> > > DIFF_OPT_SET(options, ALLOW_EXTERNAL);
> > > else if (!strcmp(arg, "--no-ext-diff"))
> > > DIFF_OPT_CLR(options, ALLOW_EXTERNAL);
> > > - else if (!strcmp(arg, "--textconv"))
> > > + else if (!strcmp(arg, "--textconv")) {
> > > DIFF_OPT_SET(options, ALLOW_TEXTCONV);
> > > - else if (!strcmp(arg, "--no-textconv"))
> > > + DIFF_OPT_SET(options, TEXTCONV_SET_VIA_CMDLINE);
> > > + } else if (!strcmp(arg, "--no-textconv")) {
> > > DIFF_OPT_CLR(options, ALLOW_TEXTCONV);
> >
> > Also clear TEXTCONV_SET_VIA_CMDLINE here?
> > (`git show --textconv --no-textconv` might act funny?)
>
> Oops, thanks for catching this, I added it in the wrong place! (as you
> can see below.
wait nevermind, i overreacted. And this patch does correctly clear
TEXTCONV_SET_VIA_CMDLINE.
>
> >
> > > - else if (!strcmp(arg, "--ignore-submodules")) {
> > > + DIFF_OPT_CLR(options, TEXTCONV_SET_VIA_CMDLINE);
> > > + } else if (!strcmp(arg, "--ignore-submodules")) {
> > > DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG);
> > > handle_ignore_submodules_arg(options, "all");
> > > } else if (skip_prefix(arg, "--ignore-submodules=", &arg)) {
> > > diff --git a/diff.h b/diff.h
> > > index 47e6d43cb..4eaf9b370 100644
> > > --- a/diff.h
> > > +++ b/diff.h
> > > @@ -83,6 +83,7 @@ struct diff_flags {
> > > unsigned DIRSTAT_CUMULATIVE:1;
> > > unsigned DIRSTAT_BY_FILE:1;
> > > unsigned ALLOW_TEXTCONV:1;
> > > + unsigned TEXTCONV_SET_VIA_CMDLINE:1;
> > > unsigned DIFF_FROM_CONTENTS:1;
> > > unsigned DIRTY_SUBMODULES:1;
> > > unsigned IGNORE_UNTRACKED_IN_SUBMODULES:1;
> > > --
> > > 2.15.0.403.gc27cc4dac6-goog
> > >
>
> --
> Brandon Williams
--
Brandon Williams
