X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-resolve-script;h=7c0e3d8aa8f7e63d1e98b79612844043a8481011;hb=62cd033daa48f5fadda8921635a7073d3adc4a32;hp=4641119e0f00848f5dacce40fd376efc1cbdbcb5;hpb=9d34c29db39bdb5c2443475dd6a24cfc5c2c9e37;p=git.git diff --git a/git-resolve-script b/git-resolve-script index 4641119e..7c0e3d8a 100755 --- a/git-resolve-script +++ b/git-resolve-script @@ -6,21 +6,25 @@ # . git-sh-setup-script || die "Not a git archive" -head=$(git-rev-parse --verify "$1"^0) || exit -merge=$(git-rev-parse --verify "$2"^0) || exit -merge_msg="$3" +usage () { + die "git-resolve-script " +} dropheads() { rm -f -- "$GIT_DIR/MERGE_HEAD" \ "$GIT_DIR/LAST_MERGE" || exit 1 } +head=$(git-rev-parse --verify "$1"^0) && +merge=$(git-rev-parse --verify "$2"^0) && +merge_msg="$3" || usage + # # The remote name is just used for the message, # but we do want it. # if [ -z "$head" -o -z "$merge" -o -z "$merge_msg" ]; then - die "git-resolve-script " + usage fi dropheads @@ -45,7 +49,41 @@ if [ "$common" == "$head" ]; then dropheads exit 0 fi -echo "Trying to merge $merge into $head" + +# Find an optimum merge base if there are more than one candidates. +LF=' +' +common=$(git-merge-base -a $head $merge) +case "$common" in +?*"$LF"?*) + echo "Trying to find the optimum merge base." + G=.tmp-index$$ + best= + best_cnt=-1 + for c in $common + do + rm -f $G + GIT_INDEX_FILE=$G git-read-tree -m $c $head $merge \ + 2>/dev/null || continue + # Count the paths that are unmerged. + cnt=`GIT_INDEX_FILE=$G git-ls-files --unmerged | wc -l` + if test $best_cnt -le 0 -o $cnt -le $best_cnt + then + best=$c + best_cnt=$cnt + if test "$best_cnt" -eq 0 + then + # Cannot do any better than all trivial merge. + break + fi + fi + done + rm -f $G + common="$best" +esac + +echo "Trying to merge $merge into $head using $common." +git-update-cache --refresh 2>/dev/null git-read-tree -u -m $common $head $merge || exit 1 result_tree=$(git-write-tree 2> /dev/null) if [ $? -ne 0 ]; then