X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=e50fbb1160ad6ccfebc0d65fcc54bc3488e597cd;hb=e6c310fd0d7384973efc6b1d5999a5e8a5b2f3bd;hp=3457a96cfd7a27ae4dffcf5d3f1ff2f9568bd83d;hpb=1301c6eb412e7c5511b952a12e42c70ad56f028b;p=git.git diff --git a/git-merge.sh b/git-merge.sh index 3457a96c..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] [-s ]... +" -} - -# all_strategies='resolve recursive stupid octopus' - -all_strategies='recursive octopus resolve stupid' -default_strategies='resolve octopus' +all_strategies='recursive octopus resolve stupid ours' +default_strategies='recursive' use_strategies= dropsave() { @@ -25,7 +21,7 @@ dropsave() { savestate() { # Stash away any local modifications. - git-diff-index -r -z --name-only $head | + git-diff-index -z --name-only $head | cpio -0 -o >"$GIT_DIR/MERGE_SAVE" } @@ -63,6 +59,8 @@ do -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\ --no-summa|--no-summar|--no-summary) no_summary=t ;; + --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit) + no_commit=t ;; -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ --strateg=*|--strategy=*|\ -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) @@ -88,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" @@ -102,27 +95,37 @@ 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" in -*,'') +case "$#,$common,$no_commit" in +*,'',*) # No common ancestors found. We need a real merge. ;; -1,"$1") +1,"$1",*) # If head can reach all the merge then we are up to date. # but first the most common case of merging one remote echo "Already up-to-date." dropsave exit 0 ;; -1,"$head") +1,"$head",*) # Again the most common case of merging one remote. echo "Updating from $head to $1." git-update-index --refresh 2>/dev/null @@ -132,11 +135,11 @@ case "$#,$common" in dropsave exit 0 ;; -1,?*"$LF"?*) +1,?*"$LF"?*,*) # We are not doing octopus and not fast forward. Need a # real merge. ;; -1,*) +1,*,) # We are not doing octopus, not fast forward, and have only # one common. See if it is really trivial. echo "Trying really trivial in-index merge..." @@ -160,7 +163,7 @@ case "$#,$common" 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 @@ -176,6 +179,17 @@ case "$#,$common" 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 @@ -210,12 +224,18 @@ do # Remember which strategy left the state in the working tree wt_strategy=$strategy - git-merge-$strategy $common -- "$head_arg" "$@" || { + git-merge-$strategy $common -- "$head_arg" "$@" + exit=$? + if test "$no_commit" = t && test "$exit" = 0 + then + exit=1 ;# pretend it left conflicts. + fi + + test "$exit" = 0 || { # The backend exits with 1 when conflicts are left to be resolved, # with 2 when it does not handle the given merge at all. - exit=$? if test "$exit" -eq 1 then cnt=`{ @@ -254,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. @@ -272,4 +293,4 @@ do done >"$GIT_DIR/MERGE_HEAD" echo $merge_msg >"$GIT_DIR/MERGE_MSG" -die "Automatic merge failed; fix up by hand" +die "Automatic merge failed/prevented; fix up by hand"