[PATCH v2 23/24] submodule--helper: fix bad config API usage
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Jul 19, 2022, 20:47 UTC
- Message-ID
- <patch-v2-23.24-d77c6665ca9-20220719T204458Z-avarab@gmail.com>
- In-Reply-To
- <cover-v2-00.24-00000000000-20220719T204458Z-avarab@gmail.com>
Fix bad config API usage added in a452128a36c (submodule--helper: introduce add-config subcommand, 2021-08-06). After git_config_get_string() returns successfully we know the "char **dest" will be non-NULL.
A coccinelle patch that transforms this turns up a couple of other such issues, one in fetch-pack.c, and another in upload-pack.c:
@@ identifier F =~ "^(repo|git)_config_get_string(_tmp)?$"; identifier V; @@ !F(..., &V) - && (V)
But let's focus narrowly on submodule--helper for now, we can fix those some other time.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/submodule--helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 37d414258cc..a944f6fa442 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -3309,7 +3309,7 @@ static void configure_added_submodule(struct add_data *add_data) * is_submodule_active(), since that function needs to find * out the value of "submodule.active" again anyway. */ - if (!git_config_get_string("submodule.active", &val) && val) { + if (!git_config_get_string("submodule.active", &val)) { /* * If the submodule being added isn't already covered by the * current configured pathspec, set the submodule's active flag
-- 2.37.1.1062.g385eac7fccf