averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-01 18:24:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

config: format bools gently

Browse Source 
Move the logic for formatting bool config values into a helper method
and use gentle parsing when needed.

This makes 'git config list --type=bool' not fail when coming across a
non-boolean value. Such unparseable values are filtered out quietly.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Derrick Stolee
2026-02-23 12:26:47 +00:00
committed by Junio C Hamano
parent d744923fef
commit 53959a8ba2
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
builtin/config.c
View File

@@ -256,6 +256,24 @@ static int format_config_int64(struct strbuf *buf,
return 0;
}
static int format_config_bool(struct strbuf *buf,
const char *key_,
const char *value_,
int gently)
{
int v = 0;
if (gently) {
if ((v = git_parse_maybe_bool(value_)) < 0)
return -1;
} else {
/* may die() */
v = git_config_bool(key_, value_);
}
strbuf_addstr(buf, v ? "true" : "false");
return 0;
}
/*
* Format the configuration key-value pair (`key_`, `value_`) and
* append it into strbuf `buf`. Returns a negative value on failure,
@@ -284,8 +302,7 @@ static int format_config(const struct config_display_options *opts,
if (opts->type == TYPE_INT)
res = format_config_int64(buf, key_, value_, kvi, gently);
else if (opts->type == TYPE_BOOL)
strbuf_addstr(buf, git_config_bool(key_, value_) ?
"true" : "false");
res = format_config_bool(buf, key_, value_, gently);
else if (opts->type == TYPE_BOOL_OR_INT) {
int is_bool, v;
v = git_config_bool_or_int(key_, value_, kvi,

4
t/t1300-config.sh
View File

@@ -2527,7 +2527,9 @@ test_expect_success 'list --type=bool shows only canonicalizable bool values' '
section.big=true
EOF
test_must_fail git config ${mode_prefix}list --type=bool
git config ${mode_prefix}list --type=bool >actual 2>err &&
test_cmp expect actual &&
test_must_be_empty err
'
test_expect_success 'list --type=bool-or-int shows only canonicalizable values' '