diff options
| author | Calvin Wan <calvinwan@google.com> | 2023-09-29 14:20:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-09-29 15:14:56 -0700 |
| commit | e16be13cfaf1102340c7816d14cec2009a864faf (patch) | |
| tree | 69112331c66161daef19e4af91c713cc22b198f0 | |
| parent | wrapper: reduce scope of remove_or_warn() (diff) | |
| download | git-e16be13cfaf1102340c7816d14cec2009a864faf.tar.gz git-e16be13cfaf1102340c7816d14cec2009a864faf.zip | |
config: correct bad boolean env value error message
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>
| -rw-r--r-- | config.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -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; } /* |
