mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
01941bd543
commit
1c5fa0a179
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue