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

Johannes noticed that git-rerere depends on Digest.pm, and if
one does not use the command, one can live without it.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-am.sh b/git-am.sh
index ee6886f300f507b26bd8f96a01d30cb7c6d2ee39..98b9215f700b5cb6a01e39f0f0f0100dcb6e395e 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 || {
     # 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
     }
            echo Failed to merge in the changes.
            exit 1
     }

diff --git a/git-commit.sh b/git-commit.sh
index 073ec81e14e8aa55df913b4452ead35fb73d5134..59551d99f9672233da2d8d847f9f4d535dba26de 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -638,7 +638,10 @@ else
 fi
 ret="$?"
 rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG"
 fi
 ret="$?"
 rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG"

-git-rerere
+if test -d "$GIT_DIR/rr-cache"
+then
+       git-rerere
+fi

 
 if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
 then
 
 if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
 then

diff --git a/git-merge.sh b/git-merge.sh
index dc17baf6e0017b99f94fd9b462ce7243d1fbe0e0..74f07610fa2042ef0f2cb12c051d3be9139a680b 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -309,6 +309,9 @@ Conflicts:
                sed -e 's/^[^   ]*      /       /' |
                uniq
        } >>"$GIT_DIR/MERGE_MSG"
                sed -e 's/^[^   ]*      /       /' |
                uniq
        } >>"$GIT_DIR/MERGE_MSG"

-       git rerere
+       if test -d "$GIT_DIR/rr-cache"
+       then
+               git-rerere
+       fi

        die "Automatic merge failed; fix up by hand"
 fi
        die "Automatic merge failed; fix up by hand"
 fi