From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 8 Jul 2007 21:41:24 +0000 (-0400)
Subject: git-gui: Honor rerere.enabled configuration option
X-Git-Tag: v1.5.3-rc1~16^2~36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d4c5307701551ec65c10bef0dacc643205313098;p=git.git

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>
---

diff --git a/lib/commit.tcl b/lib/commit.tcl
index f9791f64d..0de2a28fa 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}
 	}