X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-resolve-script;h=000cbb85e3ffd4be739ce0791d1afa59832aa734;hb=99977bd5fdeabbd0608a70e9411c243007ec4ea2;hp=50d5f8336feec0eb9839a2641cb9faf9ab67391d;hpb=b0e985d5de5623a56a3ff1e8a77af6323774f93f;p=git.git

diff --git a/git-resolve-script b/git-resolve-script
index 50d5f833..000cbb85 100755
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -36,20 +36,56 @@ if [ -z "$common" ]; then
 	die "Unable to find common commit between" $merge $head
 fi
 
-if [ "$common" == "$merge" ]; then
+case "$common" in
+"$merge")
 	echo "Already up-to-date. Yeeah!"
 	dropheads
 	exit 0
-fi
-if [ "$common" == "$head" ]; then
+	;;
+"$head")
 	echo "Updating from $head to $merge."
 	git-read-tree -u -m $head $merge || exit 1
 	echo $merge > "$GIT_DIR"/HEAD
 	git-diff-tree -p $head $merge | git-apply --stat
 	dropheads
 	exit 0
-fi
-echo "Trying to merge $merge into $head"
+	;;
+esac
+
+# 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