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

* jk/maint-decorate-01-bool: handle arbitrary ints in git_config_maybe_bool
git-mirror · Dec 21, 2010 · f7d07cc · f7d07cc
2 parents 876e78f + db6195e
commit f7d07cc
Showing 1 changed file with 3 additions and 5 deletions.
diff --git 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;
 }