git_config_bool_or_int()

This new function can be used by config parsers to tell if a variable
is simply set, set to 1, or set to "true".

Signed-off-by: Junio C Hamano <gitster@pobox.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/config.c b/config.c
index 062449459e..5ea18efaec 100644
--- a/config.c
+++ b/config.c
@@ -303,8 +303,9 @@ unsigned long git_config_ulong(const char *name, const char *value)
 	return ret;
 }
 
-int git_config_bool(const char *name, const char *value)
+int git_config_bool_or_int(const char *name, const char *value, int *is_bool)
 {
+	*is_bool = 1;
 	if (!value)
 		return 1;
 	if (!*value)
@@ -313,9 +314,16 @@ int git_config_bool(const char *name, const char *value)
 		return 1;
 	if (!strcasecmp(value, "false") || !strcasecmp(value, "no"))
 		return 0;
+	*is_bool = 0;
 	return git_config_int(name, value) != 0;
 }
 
+int git_config_bool(const char *name, const char *value)
+{
+	int discard;
+	return git_config_bool_or_int(name, value, &discard);
+}
+
 int git_config_string(const char **dest, const char *var, const char *value)
 {
 	if (!value)