From: Oded Shimon <ods15@ods15.dyndns.org>
Date: Thu, 9 Sep 2010 18:49:51 +0000 (+0300)
Subject: Add --src/dst-prefix to git-formt-patch in git-rebase.sh
X-Git-Tag: v1.7.3-rc2~2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5b220a6876f37d6c88d1d7a54ec115efc1e25255;p=git.git

Add --src/dst-prefix to git-formt-patch in git-rebase.sh

For the case of "diff.noprefix" in git-config, git-format-patch should
still output diff with standard prefixes for git-am

Signed-off-by: Oded Shimon <ods15@ods15.dyndns.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase.sh b/git-rebase.sh
index 1b9ea48cd..acca22dc7 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -544,6 +544,7 @@ fi
 if test -z "$do_merge"
 then
 	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