From: Jeff King Date: Sun, 19 Dec 2010 03:36:41 +0000 (-0500) Subject: handle arbitrary ints in git_config_maybe_bool X-Git-Tag: v1.7.4-rc0~17^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=db6195efab70aa3aca1cc8e39855f2cd58e0287b;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/config.c b/config.c index 9918b9351..1bf10046b 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; }