Re: [PATCH] Add explicit --src/dst-prefix to git-formt-patch in git-rebase.sh for the case of "diff.noprefix" in git-config

["Jan Krüger" <jk@jk.gs>]

Oded Shimon <ods15@ods15.dyndns.org> wrote:

> ---

A shorter summary (subject) and more of a commit message body might be a
good idea. People tend to like patch summaries that fit into one line
on a terminal, and shorter is even better for those tools that output
additional fields on the same line.

Signoff is missing, please see Documentation/SubmittingPatches for
details (including the reason why we need one in the first place).

I can't comment on the patch itself since I'm not familiar with the
whole diff machinery nor the innards of rebase.

>  git-rebase.sh |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/git-rebase.sh b/git-rebase.sh
> index 7508463..e83a0cf 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -565,7 +565,7 @@ fi
>  
>  if test -z "$do_merge"
>  then
> -	git format-patch -k --stdout --full-index
> --ignore-if-in-upstream \
> +	git format-patch -k --stdout --full-index
> --ignore-if-in-upstream --src-prefix=a/ --dst-prefix=b/ \
> --no-renames $root_flag "$revisions" | git am $git_am_opt --rebasing
> --resolvemsg="$RESOLVEMSG" && move_to_original_branch

-Jan