X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=4609fe54d52843f42d2c1d18a9dc2ff235b5c7ce;hb=8c0db2f5193153ea8a51bb45b0512c5a3889023b;hp=a05eeb29f6af4a60fab0d0b918cf319dbcbd3144;hpb=abb7c7b31c0896bd838bbb6437b310db5a42227a;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index a05eeb29..4609fe54 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -146,6 +146,8 @@ 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" &&
@@ -183,6 +185,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