X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=e50fbb1160ad6ccfebc0d65fcc54bc3488e597cd;hb=806f36d4d7caf75b6d3e098cb0353d85d3477c7d;hp=b810fceaf8787f6c450abc628d0a329fe298b13f;hpb=64da9e604eea25c9c20cfe12618285ccd0bf3cfe;p=git.git diff --git a/git-merge.sh b/git-merge.sh index b810fcea..e50fbb11 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -3,19 +3,15 @@ # Copyright (c) 2005 Junio C Hamano # -. git-sh-setup || die "Not a git archive" + +USAGE='[-n] [--no-commit] [-s ]... +' +. git-sh-setup LF=' ' -usage () { - die "git-merge [-n] [--no-commit] [-s ]... +" -} - -# all_strategies='resolve recursive stupid octopus' - all_strategies='recursive octopus resolve stupid ours' -default_strategies='resolve octopus' +default_strategies='recursive' use_strategies= dropsave() { @@ -90,11 +86,6 @@ do shift done -case "$use_strategies" in -'') - use_strategies=$default_strategies - ;; -esac test "$#" -le 2 && usage ;# we need at least two heads. merge_msg="$1" @@ -104,13 +95,23 @@ head=$(git-rev-parse --verify "$1"^0) || usage shift # All the rest are remote heads +remoteheads= for remote do - git-rev-parse --verify "$remote"^0 >/dev/null || + remotehead=$(git-rev-parse --verify "$remote"^0) || die "$remote - not something we can merge" + remoteheads="${remoteheads}$remotehead " done +set x $remoteheads ; shift -common=$(git-show-branch --merge-base $head "$@") +case "$#" in +1) + common=$(git-merge-base --all $head "$@") + ;; +*) + common=$(git-show-branch --merge-base $head "$@") + ;; +esac echo "$head" >"$GIT_DIR/ORIG_HEAD" case "$#,$common,$no_commit" in @@ -162,7 +163,7 @@ case "$#,$common,$no_commit" in up_to_date=t for remote do - common_one=$(git-merge-base $head $remote) + common_one=$(git-merge-base --all $head $remote) if test "$common_one" != "$remote" then up_to_date=f @@ -178,6 +179,17 @@ case "$#,$common,$no_commit" in ;; esac +case "$use_strategies" in +'') + case "$#" in + 1) + use_strategies="$default_strategies" ;; + *) + use_strategies=octopus ;; + esac + ;; +esac + # At this point, we need a real merge. No matter what strategy # we use, it would operate on the index, possibly affecting the # working tree, and when resolved cleanly, have the desired tree @@ -262,7 +274,8 @@ fi case "$best_strategy" in '') restorestate - die "No merge strategy handled the merge." + echo >&2 "No merge strategy handled the merge." + exit 2 ;; "$wt_strategy") # We already have its result in the working tree.