From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Wed, 19 Oct 2011 12:35:30 +0000 (+0100)
Subject: Merge branch 'bw/searching'
X-Git-Tag: gitgui-0.15.0^0
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ae6ec6124bb96157ca96bc90831b4874e8ad6789?ds=inline;hp=-c

Merge branch 'bw/searching'
---

ae6ec6124bb96157ca96bc90831b4874e8ad6789
diff --combined git-gui.sh
index 7eeec52281,33ab5dc3d6..21033cb0bb
--- a/git-gui.sh
+++ b/git-gui.sh
@@@ -299,7 -299,9 +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 +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
@@@ -859,7 -863,6 +863,7 @@@ set font_descs 
  	{fontui   font_ui   {mc "Main Font"}}
  	{fontdiff font_diff {mc "Diff/Console Font"}}
  }
 +set default_config(gui.stageuntracked) ask
  
  ######################################################################
  ##
@@@ -1061,6 -1064,10 +1065,10 @@@ git-version proc _parse_config {arr_nam
  				} 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) {}
  			}
  		}
  	}
@@@ -1076,6 -1083,10 +1084,10 @@@
  					} 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