[PATCH v4 3/4] config: correct bad boolean env value error message

From: Jonathan Tan <jonathantanmy@google.com>
Date: Sep 29, 2023, 21:20 UTC
Message-ID: <e4c20a81f93e2a4e2ad65920920ead690b162e25.1696021277.git.jonathantanmy@google.com>
In-Reply-To: <cover.1696021277.git.jonathantanmy@google.com>

From: Calvin Wan <calvinwan@google.com>

An incorrectly defined boolean environment value would result in the following error message:

bad boolean config value '%s' for '%s'

This is a misnomer since environment value != config value. Instead of calling git_config_bool() to parse the environment value, mimic the functionality inside of git_config_bool() but with the correct error message.

Signed-off-by: Calvin Wan <calvinwan@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 config.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/config.c b/config.c
index 3846a37be9..7dde0aaa02 100644
--- a/config.c
+++ b/config.c
@@ -2133,7 +2133,14 @@ void git_global_config(char **user_out, char **xdg_out)
 int git_env_bool(const char *k, int def)
 {
 	const char *v = getenv(k);
-	return v ? git_config_bool(k, v) : def;
+	int val;
+	if (!v)
+		return def;
+	val = git_parse_maybe_bool(v);
+	if (val < 0)
+		die(_("bad boolean environment value '%s' for '%s'"),
+		    v, k);
+	return val;
 }
 
 /*

-- 
2.42.0.582.g8ccd20d70d-goog