Log ref changes made by resolve.

From

Shawn Pearce <spearce@spearce.org>

Date

Jul 11, 2006, 06:25 UTC

Message-ID

<20060711062509.GC11822@spearce.org>

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 I have to ask:  Should git-resolve just be calling git-merge?  It
 does a fraction of what git-merge does yet it also can do the
 basic fast-forward and in-index merge that git-merge does...

 git-resolve.sh |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/git-resolve.sh b/git-resolve.sh
index 1c7aaef..a7bc680 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
 
 #
@@ -43,7 +44,8 @@ case "$common" in
 "$head")
 	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
@@ -100,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

-- 
1.4.1.gc48f