git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/4] git-gui: handle config booleans without value
@ 2011-10-14  8:14 Bert Wesarg
  2011-10-14  8:14 ` [PATCH 2/4] git-gui: add smart case search mode in searchbar Bert Wesarg
  2011-10-17 23:13 ` [PATCH 1/4] git-gui: handle config booleans without value Pat Thoyts
  0 siblings, 2 replies; 11+ messages in thread
From: Bert Wesarg @ 2011-10-14  8:14 UTC (permalink / raw)
  To: Pat Thoyts; +Cc: git, Bert Wesarg

When git interprets a config variable without a value as bool it is considered
as true. But git-gui doesn't so until yet.

The value for boolean configs are also case-insensitive.

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
---
 git-gui.sh |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/git-gui.sh b/git-gui.sh
index f897160..d687871 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -299,7 +299,9 @@ proc is_config_true {name} {
 	global repo_config
 	if {[catch {set v $repo_config($name)}]} {
 		return 0
-	} elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
+	}
+	set v [string tolower $v]
+	if {$v eq {} || $v eq {true} || $v eq {1} || $v eq {yes} || $v eq {on}} {
 		return 1
 	} else {
 		return 0
@@ -310,7 +312,9 @@ proc is_config_false {name} {
 	global repo_config
 	if {[catch {set v $repo_config($name)}]} {
 		return 0
-	} elseif {$v eq {false} || $v eq {0} || $v eq {no}} {
+	}
+	set v [string tolower $v]
+	if {$v eq {false} || $v eq {0} || $v eq {no} || $v eq {off}} {
 		return 1
 	} else {
 		return 0
@@ -1060,6 +1064,10 @@ git-version proc _parse_config {arr_name args} {
 				} else {
 					set arr($name) $value
 				}
+			} elseif {[regexp {^([^\n]+)$} $line line name]} {
+				# no value given, but interpreting them as
+				# boolean will be handled as true
+				set arr($name) {}
 			}
 		}
 	}
@@ -1075,6 +1083,10 @@ git-version proc _parse_config {arr_name args} {
 					} else {
 						set arr($name) $value
 					}
+				} elseif {[regexp {^([^=]+)$} $line line name]} {
+					# no value given, but interpreting them as
+					# boolean will be handled as true
+					set arr($name) {}
 				}
 			}
 			close $fd_rc
-- 
1.7.6.789.gb4599

^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2011-10-18  8:25 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-14  8:14 [PATCH 1/4] git-gui: handle config booleans without value Bert Wesarg
2011-10-14  8:14 ` [PATCH 2/4] git-gui: add smart case search mode in searchbar Bert Wesarg
2011-10-14  8:14   ` [PATCH 3/4] git-gui: add regexp search mode to the searchbar Bert Wesarg
2011-10-14  8:14     ` [PATCH 4/4] git-gui: add search history to searchbar Bert Wesarg
2011-10-16 22:32   ` [PATCH 2/4] git-gui: add smart case search mode in searchbar Andrew Ardill
2011-10-17  5:32     ` Bert Wesarg
2011-10-17 23:29       ` Pat Thoyts
2011-10-18  3:33         ` Andrew Ardill
2011-10-17 23:13 ` [PATCH 1/4] git-gui: handle config booleans without value Pat Thoyts
2011-10-18  6:39   ` Bert Wesarg
2011-10-18  8:25     ` Pat Thoyts

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).