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

Otherwise you'll be bitten by a stale MERGE_HEAD like Jeff was..

diff --git a/git-resolve-script b/git-resolve-script
index 0b04a5f6af8b97065cfe812509f2d96a600825ab..007e29a2edd64c4f103397bd62b5c33f98ff8382 100755 (executable)
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -32,6 +32,7 @@ fi
 
 if [ "$common" == "$merge" ]; then
        echo "Already up-to-date. Yeeah!"
 
 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
        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
        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"
        exit 0
 fi
 echo "Trying to merge $merge into $head"


@@ -58,4 +60,4 @@ result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $me
 echo "Committed merge $result_commit"
 echo $result_commit > "$GIT_DIR"/HEAD
 git-diff-tree -p $head $result_commit | git-apply --stat
 echo "Committed merge $result_commit"
 echo $result_commit > "$GIT_DIR"/HEAD
 git-diff-tree -p $head $result_commit | git-apply --stat

-rm $GIT_DIR/ORIG_HEAD $GIT_DIR/MERGE_HEAD
+rm -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD"