summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2010-12-19 03:36:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-19 18:46:08 (GMT)
commitdb6195efab70aa3aca1cc8e39855f2cd58e0287b (patch)
tree5f1df1ed6ba928f8cc723db14c420b18e4722587
parentb2be2f6aeaa8f4af602679e5571d2e916a259d91 (diff)
downloadgit-db6195efab70aa3aca1cc8e39855f2cd58e0287b.zip
git-db6195efab70aa3aca1cc8e39855f2cd58e0287b.tar.gz
git-db6195efab70aa3aca1cc8e39855f2cd58e0287b.tar.bz2
handle arbitrary ints in git_config_maybe_bool
This function recently gained the ability to recognize the documented "0" and "1" values as false/true. However, unlike regular git_config_bool, it did not treat arbitrary non-zero numbers as true. While this is undocumented and probably ridiculous for somebody to rely on, it is safer to behave exactly as git_config_bool would. Because git_config_maybe_bool can be used to retrofit new non-bool values onto existing bool options, not behaving in exactly the same way is technically a regression. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--config.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/config.c b/config.c
index 9918b93..1bf1004 100644
--- 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;
}