Re: [PATCH 3/5] diff: add --default-prefix option

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 13, 2023, 17:31 UTC
Message-ID: <xmqqpm9cv9rb.fsf@gitster.g>
In-Reply-To: <ZA9SmZaUyrgbH2fb@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 19 quoted lines

> By the way, we might also want something like this:
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index dd31d5ab91e..5b7b908b66b 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -661,7 +661,7 @@ static int run_am(struct rebase_options *opts)
>  	format_patch.git_cmd = 1;
>  	strvec_pushl(&format_patch.args, "format-patch", "-k", "--stdout",
>  		     "--full-index", "--cherry-pick", "--right-only",
> -		     "--src-prefix=a/", "--dst-prefix=b/", "--no-renames",
> +		     "--default-prefix", "--no-renames",
>  		     "--no-cover-letter", "--pretty=mboxrd", "--topo-order",
>  		     "--no-base", NULL);
>  	if (opts->git_format_patch_opt.len)
>
> which uses --src-prefix to (you may have guessed it!) counteract
> diff.noprefix in the user's config. (It would still be necessary even
> with my series because the user might have set format.patch).

Oh, you grepped around ;-)?  Good find.

Of course, nothing breaks without the above one-liner so it is somewhere between a "Meh" and a "clean-up we should do before we forget".