[PATCH] rebase-i: keep old parents when preserving merges
- From
Stephan Beyer <s-beyer@gmx.net>
- Date
- Jul 16, 2008, 01:51 UTC
- Message-ID
- <1216173109-11155-1-git-send-email-s-beyer@gmx.net>
This patch fixes two issues for rebase -i with preserving merges of unrelated branches.
Merge parents that are part of an unrelated branch have not been kept as a parent in some cases. That means, a rewritten merge commit has either lost a parent or rebase tried to cherry-pick this merge commit which resulted in an error.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net> --- 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 a35212d..0df7640 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -174,6 +174,8 @@ pick_one_preserving_merges () { new_parents="$new_parents $new_p" ;; esac + else + new_parents="$new_parents $p" fi done case $fast_forward in
-- 1.5.6.3.357.ge6ecd