| Message ID | 20230810163654.275023-3-calvinwan@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e16be13cfaf1102340c7816d14cec2009a864faf |
| Headers | show |
| Series | Introduce Git Standard Library | expand |
Calvin Wan <calvinwan@google.com> writes: > 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. Makes sense. > > Signed-off-by: Calvin Wan <calvinwan@google.com> > --- > config.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/config.c b/config.c > index 09851a6909..5b71ef1624 100644 > --- a/config.c > +++ b/config.c > @@ -2172,7 +2172,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; > } > > /*
diff --git a/config.c b/config.c index 09851a6909..5b71ef1624 100644 --- a/config.c +++ b/config.c @@ -2172,7 +2172,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; } /*
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> --- config.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)