summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-12 02:55:43 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-12 02:55:43 (GMT)
commit1536dd9c61b5582cf079999057cb715dd6dc6620 (patch)
tree29b1ba52a130a7da952ce161b7136003f9077527
parent7bbdeaa969794edd67cd4a1ed09b9a057b6af4c3 (diff)
downloadgit-1536dd9c61b5582cf079999057cb715dd6dc6620.zip
git-1536dd9c61b5582cf079999057cb715dd6dc6620.tar.gz
git-1536dd9c61b5582cf079999057cb715dd6dc6620.tar.bz2
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>
-rwxr-xr-xgit-am.sh5
-rwxr-xr-xgit-commit.sh5
-rwxr-xr-xgit-merge.sh5
3 files changed, 12 insertions, 3 deletions
diff --git a/git-am.sh b/git-am.sh
index ee6886f..98b9215 100755
--- 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
}
diff --git a/git-commit.sh b/git-commit.sh
index 073ec81..59551d9 100755
--- 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"
-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
diff --git a/git-merge.sh b/git-merge.sh
index dc17baf..74f0761 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -309,6 +309,9 @@ Conflicts:
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