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>
Shawn O. Pearce committed
Jul 8, 2007 at 17:41 UTC
d4c5307701551ec65c10bef0dacc643205313098
1 file changed
+6
-1
lib/commit.tcl
+6
-1
@@ -331,7 +331,12 @@ A rescan will be automatically started now.
331
332
# -- Let rerere do its thing.
333
#
334
- if {[file isdirectory [gitdir rr-cache]]} {
334
+ if {[get_config rerere.enabled] eq {}} {
335
+ set rerere [file isdirectory [gitdir rr-cache]]
336
+ } else {
337
+ set rerere [is_config_true rerere.enabled]
338
+ }
339
+ if {$rerere} {
340
catch {git rerere}
341
}
342