Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.

diff --git a/git-resolve-script b/git-resolve-script
old mode 100644 (file)
new mode 100755 (executable)
index da79a97..007e29a
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -32,6 +32,7 @@ fi
 
 if [ "$common" == "$merge" ]; then
        echo "Already up-to-date. Yeeah!"
+       rm -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD"
        exit 0
 fi
 if [ "$common" == "$head" ]; then
@@ -39,6 +40,7 @@ if [ "$common" == "$head" ]; then
        git-read-tree -u -m $head $merge || exit 1
        echo $merge > "$GIT_DIR"/HEAD
        git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat
+       rm -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD"
        exit 0
 fi
 echo "Trying to merge $merge into $head"
@@ -57,4 +59,5 @@ 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 -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD"