Re: [PATCH 3/5] diff: add --default-prefix option
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 9, 2023, 16:31 UTC
- Message-ID
- <xmqq5yb9q42e.fsf@gitster.g>
- In-Reply-To
- <ZAl4MkWVV8fr+3fO@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 6 quoted lines
> This isn't strictly necessary for the series, but it seemed like a gap. > You can always do: > > git -c diff.noprefix=false -c diff.mnemonicprefix=false ... > > but that's rather a mouthful.
or "git diff --src-prefix=a/ --dst-prefix=b/"
> > Note that there isn't a command-line equivalent for mnemonicprefix, > either. I don't think it's worth adding unless somebody really wants it.
I don't either. We already have src-prefix and dst-prefix.
> +--default-prefix::
> + Use the default source and destination prefixes ("a/" and "b/").
> + This is usually the default already, but may be used to override
> + config such as `diff.noprefix`.OK.
Show 7 quoted lines
> +static int diff_opt_default_prefix(const struct option *opt,
> + const char *optarg, int unset)
> +{
> + struct diff_options *options = opt->value;
> +
> + BUG_ON_OPT_NEG(unset);
> + BUG_ON_OPT_ARG(optarg);OK. It is a bit unsatisfactory that we already said this does not take negative form or any argument in the option[] array, and still have to do this, but that is completely outside the topic of this series.
Show 17 quoted lines
> + diff_set_default_prefix(options);
> + return 0;
> +}
> +
> static enum parse_opt_result diff_opt_output(struct parse_opt_ctx_t *ctx,
> const struct option *opt,
> const char *arg, int unset)
> @@ -5564,6 +5575,9 @@ struct option *add_diff_options(const struct option *opts,
> OPT_CALLBACK_F(0, "no-prefix", options, NULL,
> N_("do not show any source or destination prefix"),
> PARSE_OPT_NONEG | PARSE_OPT_NOARG, diff_opt_no_prefix),
> + OPT_CALLBACK_F(0, "default-prefix", options, NULL,
> + N_("use default prefixes a/ and b/"),
> + PARSE_OPT_NONEG | PARSE_OPT_NOARG, diff_opt_default_prefix),
> OPT_INTEGER_F(0, "inter-hunk-context", &options->interhunkcontext,
> N_("show context between diff hunks up to the specified number of lines"),
> PARSE_OPT_NONEG),Thanks.