Merge branch 'jk/maint-decorate-01-bool'

* jk/maint-decorate-01-bool:
handle arbitrary ints in git_config_maybe_bool

diff --git a/config.c b/config.c
index 32c0b2c41e01a754060e73bbf20a7f0e9c43bb10..d73b090b6a60d05b18309755dee4ce3b6e055b2d 100644 (file)
--- a/config.c
+++ b/config.c
@@ -429,13 +429,11 @@ static int git_config_maybe_bool_text(const char *name, const char *value)
 
 int git_config_maybe_bool(const char *name, const char *value)
 {
-       int v = git_config_maybe_bool_text(name, value);
+       long v = git_config_maybe_bool_text(name, value);
        if (0 <= v)
                return v;
-       if (!strcmp(value, "0"))
-               return 0;
-       if (!strcmp(value, "1"))
-               return 1;
+       if (git_parse_long(value, &v))
+               return !!v;
        return -1;
 }