From: ods15@ods15.dyndns.org
To: git@vger.kernel.org
Subject: Re: [PATCH] Add explicit --src/dst-prefix to git-formt-patch in git-rebase.sh for the case of "diff.noprefix" in git-config
Date: Wed, 8 Sep 2010 23:31:06 +0300 [thread overview]
Message-ID: <20100908203106.GD4610@crate15.ODS15-HOME> (raw)
In-Reply-To: <1283954045-8326-1-git-send-email-ods15@ods15.dyndns.org>
On Wed, Sep 08, 2010 at 04:54:05PM +0300, Oded Shimon wrote:
> ---
> 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
Hi.
I may have rudely just sent a patch without explaining anything, I thought
the patch was self explanitory. I'm not sure on the expected procedure
here for sending patches.
When using "git rebase", when "diff.noprefix" is set to true in
git-config, then all the rebases mess up because they get the directory
path wrong.
As far as I can tell, my patch fixes this, with no side-effects that I can
think of.
Can anyone comment on the patch? Can it be pushed upstream?
- ods15
next prev parent reply other threads:[~2010-09-08 20:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-08 13:54 [PATCH] Add explicit --src/dst-prefix to git-formt-patch in git-rebase.sh for the case of "diff.noprefix" in git-config Oded Shimon
2010-09-08 20:31 ` ods15 [this message]
2010-09-08 21:07 ` Jan Krüger
2010-09-09 8:07 ` [PATCH] Add --src/dst-prefix to git-formt-patch in git-rebase.sh Oded Shimon
2010-09-09 8:36 ` [Alt. PATCH] format-patch: do not use diff UI config Thomas Rast
2010-09-09 19:13 ` Sverre Rabbelier
2010-09-09 19:43 ` Jeff King
2010-09-10 16:21 ` Junio C Hamano
2010-09-09 18:35 ` [PATCH] Add --src/dst-prefix to git-formt-patch in git-rebase.sh Junio C Hamano
2010-09-09 18:49 ` ods15
2010-09-09 18:49 ` Oded Shimon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100908203106.GD4610@crate15.ODS15-HOME \
--to=ods15@ods15.dyndns.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).