Only call git-rerere if $GIT_DIR/rr-cache exists.

[git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index ee6886f..98b9215 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -88,7 +88,10 @@ fall_back_3way () {
     # saying that we reverted all those changes.
 
     git-merge-resolve $orig_tree -- HEAD $his_tree || {
-           git-rerere
+           if test -d "$GIT_DIR/rr-cache"
+           then
+               git-rerere
+           fi
            echo Failed to merge in the changes.
            exit 1
     }