Enable "git rerere" by the config variable rerere.enabled
Earlier, "git rerere" was enabled by creating the directory
.git/rr-cache. That is definitely not in line with most other
features, which are enabled by a config variable.
So, check the config variable "rerere.enabled". If it is set
to "false" explicitely, do not activate rerere, even if
.git/rr-cache exists. This should help when you want to disable
rerere temporarily.
If "rerere.enabled" is not set at all, fall back to detection
of the directory .git/rr-cache.
[jc: with minimum tweaks]
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/git-commit.sh b/git-commit.sh
index f866f95..9106a74 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -610,10 +610,7 @@
cd_to_toplevel
-if test -d "$GIT_DIR/rr-cache"
-then
- git rerere
-fi
+git rerere
if test "$ret" = 0
then
