From 840b3ca758a42cb1481259521126ba2b02a5447a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 10 Nov 2008 16:15:49 -0800 Subject: rebase: protect against diff.renames configuration We currently do not disable diff.renames configuration while rebase internally runs "format-patch" to feed "am -3". The end user configuration for "diff" should not affect the result produced by the higher level command that is related to "diff" only because internally it is implemented in terms of it. For that matter, I have a feeling that format-patch should not even look at diff.renames, but we seem to have been doing this for a long time so there is no easy way to fix this thinko. In any case, here is a much straightforward fix for "rebase". [jn: with test case from David] Reported-by: David D. Kilzer Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- git-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-rebase.sh') diff --git a/git-rebase.sh b/git-rebase.sh index ab4afa7dee..386be43d99 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -543,7 +543,7 @@ fi if test -z "$do_merge" then git format-patch -k --stdout --full-index --ignore-if-in-upstream \ - $root_flag "$revisions" | + --no-renames $root_flag "$revisions" | git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" && move_to_original_branch ret=$? -- cgit v1.2.1