diff options
author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-07-06 16:05:59 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-07-07 09:39:15 +0400 |
commit | b4372ef136b0a5a2c1dbd88a11dd72b478d0e0a5 (patch) | |
tree | 904accc21f5d15f6d6f49ba2dbe004072764c16a /contrib/emacs | |
parent | b2493649fe41f8a0db48ff4e809ea53c8a304a61 (diff) |
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>
Diffstat (limited to 'contrib/emacs')
-rw-r--r-- | contrib/emacs/git.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el index f60017948f..457f95fc05 100644 --- a/contrib/emacs/git.el +++ b/contrib/emacs/git.el @@ -681,8 +681,7 @@ and returns the process output as a string." (condition-case nil (delete-file ".git/MERGE_MSG") (error nil)) (with-current-buffer buffer (erase-buffer)) (git-set-files-state files 'uptodate) - (when (file-directory-p ".git/rr-cache") - (git-run-command nil nil "rerere")) + (git-run-command nil nil "rerere") (git-refresh-files) (git-refresh-ewoc-hf git-status) (message "Committed %s." commit) |