diff options
| author |  Pat Thoyts <patthoyts@users.sourceforge.net> | 2011-10-19 13:35:30 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2011-10-19 13:35:30 +0100 |
| commit | ae6ec6124bb96157ca96bc90831b4874e8ad6789 (patch) | |
| tree | a4ff88a6f13c3b100f3e366e410847b73e11a0b3 /git-gui.sh | |
| parent | git-gui: include the number of untracked files to stage when asking the user (diff) | |
| parent | git-gui: enable the smart case sensitive search only if gui.search.smartcase ... (diff) | |
| download | tgif-ae6ec6124bb96157ca96bc90831b4874e8ad6789.tar.xz | |
Merge branch 'bw/searching'
Diffstat (limited to 'git-gui.sh')
| -rwxr-xr-x | git-gui.sh | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/git-gui.sh b/git-gui.sh index 7eeec52281..21033cb0bb 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 @@ -1061,6 +1065,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) {} } } } @@ -1076,6 +1084,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 |