From: Junio C Hamano <junkio@cox.net>
Date: Sun, 14 Jan 2007 20:03:53 +0000 (-0800)
Subject: Merge branch 'sp/merge' (early part)
X-Git-Tag: v1.5.0-rc2~103
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6de33478affbf252066cc5863add213ca5cdc13c?ds=inline;hp=-c

Merge branch 'sp/merge' (early part)

* 'sp/merge' (early part):
Improve merge performance by avoiding in-index merges.
---

6de33478affbf252066cc5863add213ca5cdc13c
diff --combined git-merge.sh
index 7de83dc76c,1c4f6693f5..7b590268ed
--- a/git-merge.sh
+++ b/git-merge.sh
@@@ -5,14 -5,11 +5,14 @@@
  
  USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+'
  
 +SUBDIRECTORY_OK=Yes
  . git-sh-setup
  set_reflog_action "merge $*"
 +require_work_tree
 +cd_to_toplevel
  
  test -z "$(git ls-files -u)" ||
 -	die "You are in a middle of conflicted merge."
 +	die "You are in the middle of a conflicted merge."
  
  LF='
  '
@@@ -301,24 -298,30 +301,30 @@@ f,*
  	;;
  ?,1,*,)
  	# We are not doing octopus, not fast forward, and have only
- 	# one common.  See if it is really trivial.
- 	git var GIT_COMMITTER_IDENT >/dev/null || exit
- 
- 	echo "Trying really trivial in-index merge..."
+ 	# one common.
  	git-update-index --refresh 2>/dev/null
- 	if git-read-tree --trivial -m -u -v $common $head "$1" &&
- 	   result_tree=$(git-write-tree)
- 	then
- 	    echo "Wonderful."
- 	    result_commit=$(
- 	        echo "$merge_msg" |
- 	        git-commit-tree $result_tree -p HEAD -p "$1"
- 	    ) || exit
- 	    finish "$result_commit" "In-index merge"
- 	    dropsave
- 	    exit 0
- 	fi
- 	echo "Nope."
+ 	case " $use_strategies " in
+ 	*' recursive '*|*' recur '*)
+ 		: run merge later
+ 		;;
+ 	*)
+ 		# See if it is really trivial.
+ 		git var GIT_COMMITTER_IDENT >/dev/null || exit
+ 		echo "Trying really trivial in-index merge..."
+ 		if git-read-tree --trivial -m -u -v $common $head "$1" &&
+ 		   result_tree=$(git-write-tree)
+ 		then
+ 			echo "Wonderful."
+ 			result_commit=$(
+ 				echo "$merge_msg" |
+ 				git-commit-tree $result_tree -p HEAD -p "$1"
+ 			) || exit
+ 			finish "$result_commit" "In-index merge"
+ 			dropsave
+ 			exit 0
+ 		fi
+ 		echo "Nope."
+ 	esac
  	;;
  *)
  	# An octopus.  If we can reach all the remote we are up to date.