Skip to content

Commit ab89575

Browse files
peffgitster
authored andcommitted
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 5b220a6 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8d5213d commit ab89575

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/rebase.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ static int run_am(struct rebase_options *opts)
660660
format_patch.git_cmd = 1;
661661
strvec_pushl(&format_patch.args, "format-patch", "-k", "--stdout",
662662
"--full-index", "--cherry-pick", "--right-only",
663-
"--src-prefix=a/", "--dst-prefix=b/", "--no-renames",
663+
"--default-prefix", "--no-renames",
664664
"--no-cover-letter", "--pretty=mboxrd", "--topo-order",
665665
"--no-base", NULL);
666666
if (opts->git_format_patch_opt.len)

0 commit comments

Comments
 (0)