X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-resolve.sh;h=a7bc680d90cb503c50d25b15bcaba662c5f5b49e;hb=24cf6e5847073d50390e0b7950e8e6b5a09103bc;hp=926307005493b7c8c4253b1adff34bdb4bc57b77;hpb=806f36d4d7caf75b6d3e098cb0353d85d3477c7d;p=git.git

diff --git a/git-resolve.sh b/git-resolve.sh
index 926307005..a7bc680d9 100755
--- a/git-resolve.sh
+++ b/git-resolve.sh
@@ -15,6 +15,7 @@ dropheads() {
 
 head=$(git-rev-parse --verify "$1"^0) &&
 merge=$(git-rev-parse --verify "$2"^0) &&
+merge_name="$2" &&
 merge_msg="$3" || usage
 
 #
@@ -41,15 +42,19 @@ 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-update-ref -m "resolve $merge_name: Fast forward" \
+		HEAD "$merge" "$head"
 	git-diff-tree -p $head $merge | git-apply --stat
 	dropheads
 	exit 0
 	;;
 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='
 '
@@ -97,6 +102,7 @@ if [ $? -ne 0 ]; then
 fi
 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
 echo "Committed merge $result_commit"
-git-update-ref HEAD "$result_commit" "$head"
+git-update-ref -m "resolve $merge_name: In-index merge" \
+	HEAD "$result_commit" "$head"
 git-diff-tree -p $head $result_commit | git-apply --stat
 dropheads