@matheusbsbs / matheus-bagliano / commits / f91333d646
Fork 0

git-rebase--interactive.sh: Make 3-way merge strategies work for -p.

git-rebase--interactive.sh used to pass all parents of a merge commit to git-merge, which means that we have at least 3 heads to merge: HEAD, first parent and second parent. So 3-way merge strategies like recursive wouldn't work. Fortunately, we have checked out the first parent right before the merge anyway, so that is HEAD. Therefore we can drop simply it from the list of parents, making 3-way strategies work for merge commits with only two parents. Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Björn Steinbrink committed Oct 31, 2007 at 03:20 UTC f91333d646e690d9a10717c96e166a069b2bb586
1 file changed +2
git-rebase--interactive.sh
+2
@@ -165,6 +165,8 @@ pick_one_preserving_merges () {
165 eval "$author_script"
166 msg="$(git cat-file commit $sha1 | \
167 sed -e '1,/^$/d' -e "s/[\"\\]/\\\\&/g")"
168 + # No point in merging the first parent, that's HEAD
169 + new_parents=${new_parents# $first_parent}
170 # NEEDSWORK: give rerere a chance
171 if ! output git merge $STRATEGY -m "$msg" $new_parents
172 then