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

From: Jeff King <peff@peff.net>
Date: Mar 13, 2023, 19:54 UTC
Message-ID: <ZA9/Y6HN7y5dAy0T@coredump.intra.peff.net>
In-Reply-To: <xmqqpm9cv9rb.fsf@gitster.g>

On Mon, Mar 13, 2023 at 10:31:04AM -0700, Junio C Hamano wrote:

Show 6 quoted lines

> > -		     "--src-prefix=a/", "--dst-prefix=b/", "--no-renames",
> > +		     "--default-prefix", "--no-renames",
> [...]
> 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".

So here it is as a patch, if you want to throw it on top of jk/format-patch-ignore-noprefix.

I have to admit that after writing the relatively weak argument in the commit message, it does feel a bit like churn. So I am also OK to just leave it as-is.

-- >8 --
Subject: rebase: prefer --default-prefix to --{src,dst}-prefix for format-patch

When git-rebase invokes format-patch, it wants to make sure we use the normal prefixes, and are not confused by diff.noprefix or similar. When this was added in 5b220a6876f (Add --src/dst-prefix to git-formt-patch in git-rebase.sh, 2010-09-09), we only had --src-prefix and --dst-prefix to do so, which requires re-specifying the prefixes we expect to see. These days we can say what we want more directly: just use the defaults.

This is a minor cleanup that should have no behavior change, but hopefully the result expresses more clearly what the code is trying to accomplish.

Signed-off-by: Jeff King <peff@peff.net>
---
 builtin/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 6635f10d529..a47dfd45efd 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -660,7 +660,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)

-- 
2.40.0.572.gc7ee6f1a071