diff options
| author | Stephan Beyer <s-beyer@gmx.net> | 2008-07-16 01:51:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-16 22:13:53 (GMT) |
| commit | 1c5fa0a179a76f13a6970a281ad876cff44fd8ee (patch) | |
| tree | df551946fd352860a4618507747597499aa85771 /git-rebase--interactive.sh | |
| parent | 01941bd54387aee029315d565f0bc1a5b9c5541a (diff) | |
| download | git-1c5fa0a179a76f13a6970a281ad876cff44fd8ee.zip git-1c5fa0a179a76f13a6970a281ad876cff44fd8ee.tar.gz git-1c5fa0a179a76f13a6970a281ad876cff44fd8ee.tar.bz2 | |
rebase-i: keep old parents when preserving merges
When "rebase -i -p" tries to preserve merges of unrelated branches, it
lost some parents:
- When you have more than two parents, the commit in the new history
ends up with fewer than expected number of parents and this breakage
goes unnoticed;
- When you are rebasing a merge with two parents and one is lost, the
command tries to cherry-pick the original merge commit, and the command
fails.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index a64d9d5..e3f65bd 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -162,6 +162,8 @@ pick_one_preserving_merges () { new_parents="$new_parents $new_p" ;; esac + else + new_parents="$new_parents $p" fi done case $fast_forward in |