summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-07-08 21:41:24 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-07-08 21:41:24 (GMT)
commitd4c5307701551ec65c10bef0dacc643205313098 (patch)
tree2037e246c9c1c8b3fbfcbb60151cf81bf78e9588 /lib
parentf8186e92e3399ddd742f2397e802467cabf2849f (diff)
downloadgit-d4c5307701551ec65c10bef0dacc643205313098.zip
git-d4c5307701551ec65c10bef0dacc643205313098.tar.gz
git-d4c5307701551ec65c10bef0dacc643205313098.tar.bz2
git-gui: Honor rerere.enabled configuration option
Recently in git.git change b4372ef136 Johannes Schindelin taught git-commit.sh to invoke (or skip) calling git-rerere based upon the rerere.enabled configuration setting: 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. We now do the same logic in git-gui's own commit implementation. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/commit.tcl7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/commit.tcl b/lib/commit.tcl
index f9791f6..0de2a28 100644
--- a/lib/commit.tcl
+++ b/lib/commit.tcl
@@ -331,7 +331,12 @@ A rescan will be automatically started now.
# -- Let rerere do its thing.
#
- if {[file isdirectory [gitdir rr-cache]]} {
+ if {[get_config rerere.enabled] eq {}} {
+ set rerere [file isdirectory [gitdir rr-cache]]
+ } else {
+ set rerere [is_config_true rerere.enabled]
+ }
+ if {$rerere} {
catch {git rerere}
}