Merge branch 'vb/sendemail' into next

diff --git a/git-resolve.sh b/git-resolve.sh
index 926307005493b7c8c4253b1adff34bdb4bc57b77..1c7aaefa2528b73fea3eee22b086b94fa91854c5 100755 (executable)
--- a/git-resolve.sh
+++ b/git-resolve.sh
@@ -41,7 +41,7 @@ case "$common" in
        exit 0
        ;;
 "$head")
-       echo "Updating from $head to $merge."
+       echo "Updating from $head to $merge"
        git-read-tree -u -m $head $merge || exit 1
        git-update-ref HEAD "$merge" "$head"
        git-diff-tree -p $head $merge | git-apply --stat
@@ -50,6 +50,9 @@ case "$common" in
        ;;
 esac
 
+# We are going to make a new commit.
+git var GIT_COMMITTER_IDENT >/dev/null || exit
+
 # Find an optimum merge base if there are more than one candidates.
 LF='
 '