summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-18 21:46:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-18 21:46:22 (GMT)
commit4f760b74cfaa23222901739cdc62951cc7b8c5b6 (patch)
tree1452411184a945174ddddf05156d37c880bf1529 /config.c
parent9824a388e53ba0951e38f246038fa0ef6fda3397 (diff)
parent0cbcf7ad71559245b59b90a324011fcf0657af8c (diff)
downloadgit-4f760b74cfaa23222901739cdc62951cc7b8c5b6.zip
git-4f760b74cfaa23222901739cdc62951cc7b8c5b6.tar.gz
git-4f760b74cfaa23222901739cdc62951cc7b8c5b6.tar.bz2
Merge branch 'lt/bool-on-off'
* lt/bool-on-off: Documentation: boolean value may be given by on/off Allow users to un-configure rename detection
Diffstat (limited to 'config.c')
-rw-r--r--config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/config.c b/config.c
index 2d70398..8c1ae59 100644
--- a/config.c
+++ b/config.c
@@ -331,9 +331,9 @@ int git_config_bool_or_int(const char *name, const char *value, int *is_bool)
return 1;
if (!*value)
return 0;
- if (!strcasecmp(value, "true") || !strcasecmp(value, "yes"))
+ if (!strcasecmp(value, "true") || !strcasecmp(value, "yes") || !strcasecmp(value, "on"))
return 1;
- if (!strcasecmp(value, "false") || !strcasecmp(value, "no"))
+ if (!strcasecmp(value, "false") || !strcasecmp(value, "no") || !strcasecmp(value, "off"))
return 0;
*is_bool = 0;
return git_config_int(name, value);