diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-06 13:38:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-06 13:38:29 -0700 |
| commit | 87daf40750c9e344dd50495fdca1809aebcb1a94 (patch) | |
| tree | 3f08482461e3484d5e77c7575c3fa35af28a33a4 /submodule.c | |
| parent | e9dffbc7f11704bd25e5a36e41e5fe5c5d1f7183 (diff) | |
| parent | 3611f7467fddcff6063ed2c99484047b410969fc (diff) | |
| download | git-87daf40750c9e344dd50495fdca1809aebcb1a94.tar.gz | |
Merge branch 'ab/config-multi-and-nonbool'
Assorted config API updates.
* ab/config-multi-and-nonbool:
for-each-repo: with bad config, don't conflate <path> and <cmd>
config API: add "string" version of *_value_multi(), fix segfaults
config API users: test for *_get_value_multi() segfaults
for-each-repo: error on bad --config
config API: have *_multi() return an "int" and take a "dest"
versioncmp.c: refactor config reading next commit
config API: add and use a "git_config_get()" family of functions
config tests: add "NULL" tests for *_get_value_multi()
config tests: cover blind spots in git_die_config() tests
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/submodule.c b/submodule.c index 2a057c35b7..c9579f9a3f 100644 --- a/submodule.c +++ b/submodule.c @@ -275,8 +275,7 @@ int is_tree_submodule_active(struct repository *repo, free(key); /* submodule.active is set */ - sl = repo_config_get_value_multi(repo, "submodule.active"); - if (sl) { + if (!repo_config_get_string_multi(repo, "submodule.active", &sl)) { struct pathspec ps; struct strvec args = STRVEC_INIT; const struct string_list_item *item; |