Make "git commit" work correctly in the presense of a manual merge

diff --git a/git-resolve-script b/git-resolve-script
index cd6e25a8a2bfca43f4b4b01cfda4378203b2b09c..0b04a5f6af8b97065cfe812509f2d96a600825ab 100644 (file)
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -43,7 +43,7 @@ if [ "$common" == "$head" ]; then
 fi
 echo "Trying to merge $merge into $head"
 git-read-tree -u -m $common $head $merge || exit 1
-merge_msg="Merge of $merge_repo"
+merge_msg="Merge $merge_repo"
 result_tree=$(git-write-tree  2> /dev/null)
 if [ $? -ne 0 ]; then
        echo "Simple merge failed, trying Automatic merge"
@@ -52,10 +52,10 @@ if [ $? -ne 0 ]; then
                echo "Automatic merge failed, fix up by hand"
                exit 1
        fi
-       merge_msg="Automatic merge of $merge_repo"
        result_tree=$(git-write-tree) || exit 1
 fi
 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
 echo "Committed merge $result_commit"
 echo $result_commit > "$GIT_DIR"/HEAD
-git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat
+git-diff-tree -p $head $result_commit | git-apply --stat
+rm $GIT_DIR/ORIG_HEAD $GIT_DIR/MERGE_HEAD