diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-10 16:15:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-23 14:46:28 -0700 |
| commit | 840b3ca758a42cb1481259521126ba2b02a5447a (patch) | |
| tree | 127238c896ab3dcf9bed7eb4a360f02032f5f1a1 /git-rebase.sh | |
| parent | e877a4c11a947789a8b88234e458164ea16675bd (diff) | |
| download | git-840b3ca758a42cb1481259521126ba2b02a5447a.tar.gz | |
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 <ddkilzer@kilzer.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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=$? |