X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=git-merge.sh;h=7f481e4caacf295635f1fb69c9b4f1c364355234;hb=f98d863d2122e1b8781dfb9889df98876a26f315;hp=3465041bc4c9b2512623ee6c06317ecb7689e528;hpb=b23f02ee7aa3fc1cdaf6aebde9b731f22671251b;p=git.git diff --git a/git-merge.sh b/git-merge.sh index 3465041b..7f481e4c 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -9,12 +9,12 @@ LF=' ' usage () { - die "git-merge [-n] [-s ]... +" + die "git-merge [-n] [--no-commit] [-s ]... +" } # all_strategies='resolve recursive stupid octopus' -all_strategies='recursive octopus resolve stupid' +all_strategies='recursive octopus resolve stupid ours' default_strategies='resolve octopus' use_strategies= @@ -25,7 +25,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" } @@ -38,10 +38,20 @@ restorestate() { fi } -summary() { +finish () { + test '' = "$2" || echo "$2" + case "$merge_msg" in + '') + echo "No merge message -- not updating HEAD" + ;; + *) + git-update-ref HEAD "$1" "$head" || exit 1 + ;; + esac + case "$no_summary" in '') - git-diff-tree -p -M $head "$1" | + git-diff-tree -p -M "$head" "$1" | git-apply --stat --summary ;; esac @@ -53,6 +63,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) @@ -98,36 +110,42 @@ do die "$remote - not something we can merge" done -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. Yeeah!" + 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 - git-read-tree -u -m $head "$1" && new_head=$(git-rev-parse --verify "$1^0") && - git-update-ref HEAD "$new_head" "$head" || exit 1 - summary "$1" + git-read-tree -u -m $head "$new_head" && + finish "$new_head" "Fast forward" 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..." @@ -140,8 +158,7 @@ case "$#,$common" in echo "$merge_msg" | git-commit-tree $result_tree -p HEAD -p "$1" ) || exit - git-update-ref HEAD $result_commit $head - summary $result_commit + finish "$result_commit" "In-index merge" dropsave exit 0 fi @@ -152,7 +169,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 @@ -202,12 +219,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=`{ @@ -237,9 +260,7 @@ then parents="$parents -p $remote" done result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree $parents) || exit - echo "Committed merge $result_commit, made by $wt_strategy." - git-update-ref HEAD $result_commit $head - summary $result_commit + finish "$result_commit" "Merge $result_commit, made by $wt_strategy." dropsave exit 0 fi @@ -266,4 +287,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"