X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=c258ea78bcd5dc944155b629ef429de247a6bac5;hb=687dd75c95f9212244b6cf4fe60b40db44de01ba;hp=dc17baf6e0017b99f94fd9b462ce7243d1fbe0e0;hpb=90768daaa006516c7ae69ed89d7c2e67243dfac1;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index dc17baf6..c258ea78 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -130,7 +130,7 @@ case "$#,$common,$no_commit" in
 	echo "Updating from $head to $1."
 	git-update-index --refresh 2>/dev/null
 	new_head=$(git-rev-parse --verify "$1^0") &&
-	git-read-tree -u -m $head "$new_head" &&
+	git-read-tree -u -v -m $head "$new_head" &&
 	finish "$new_head" "Fast forward"
 	dropsave
 	exit 0
@@ -142,9 +142,11 @@ case "$#,$common,$no_commit" in
 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..."
 	git-update-index --refresh 2>/dev/null
-	if git-read-tree --trivial -m -u $common $head "$1" &&
+	if git-read-tree --trivial -m -u -v $common $head "$1" &&
 	   result_tree=$(git-write-tree)
 	then
 	    echo "Wonderful."
@@ -179,6 +181,9 @@ case "$#,$common,$no_commit" in
 	;;
 esac
 
+# We are going to make a new commit.
+git var GIT_COMMITTER_IDENT >/dev/null || exit
+
 case "$use_strategies" in
 '')
 	case "$#" in
@@ -309,6 +314,9 @@ Conflicts:
 		sed -e 's/^[^	]*	/	/' |
 		uniq
 	} >>"$GIT_DIR/MERGE_MSG"
-	git rerere
+	if test -d "$GIT_DIR/rr-cache"
+	then
+		git-rerere
+	fi
 	die "Automatic merge failed; fix up by hand"
 fi