merge script: handle many-way octopus

Based on v1.6.0-rc0~51^2~5 (Build in merge, 2008-07-07).

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index 91e33a3f0368f35274f43ca7eebc1b0cf557be27..410fa3c815680c3f9894b82bfa43545da91c75cb 100755 (executable)
--- a/contrib/examples/git-merge.sh
+++ b/contrib/examples/git-merge.sh
@@ -374,7 +374,7 @@ case "$#" in
        common=$(git merge-base --all $head "$@")
        ;;
 *)
        common=$(git merge-base --all $head "$@")
        ;;
 *)

-       common=$(git show-branch --merge-base $head "$@")
+       common=$(git merge-base --all --octopus $head "$@")

        ;;
 esac
 echo "$head" >"$GIT_DIR/ORIG_HEAD"
        ;;
 esac
 echo "$head" >"$GIT_DIR/ORIG_HEAD"


@@ -528,9 +528,9 @@ if test '' != "$result_tree"
 then
     if test "$allow_fast_forward" = "t"
     then
 then
     if test "$allow_fast_forward" = "t"
     then

-        parents=$(git show-branch --independent "$head" "$@")
+       parents=$(git merge-base --independent "$head" "$@")

     else
     else

-        parents=$(git rev-parse "$head" "$@")
+       parents=$(git rev-parse "$head" "$@")

     fi
     parents=$(echo "$parents" | sed -e 's/^/-p /')
     result_commit=$(printf '%s\n' "$merge_msg" | git commit-tree $result_tree $parents) || exit
     fi
     parents=$(echo "$parents" | sed -e 's/^/-p /')
     result_commit=$(printf '%s\n' "$merge_msg" | git commit-tree $result_tree $parents) || exit