git-gui: handle config booleans without value

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>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

diff --git a/git-gui.sh b/git-gui.sh
index e5dd8bc1f2ffb489f4b41470c3cbda5ff7ca4656..33ab5dc3d61d67cc25fc702a62e2f998c3d71d28 100755 (executable)
--- 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
        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
                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
        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
                return 1
        } else {
                return 0


@@ -1060,6 +1064,10 @@ git-version proc _parse_config {arr_name args} {
                                } else {
                                        set arr($name) $value
                                }
                                } 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
                                        }
                                        } 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
                                }
                        }
                        close $fd_rc