diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-06 23:38:28 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-06 23:38:29 +0300 |
| commit | 87daf40750c9e344dd50495fdca1809aebcb1a94 (patch) | |
| tree | 3f08482461e3484d5e77c7575c3fa35af28a33a4 /builtin/worktree.c | |
| parent | e9dffbc7f11704bd25e5a36e41e5fe5c5d1f7183 (diff) | |
| parent | 3611f7467fddcff6063ed2c99484047b410969fc (diff) | |
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 'builtin/worktree.c')
| -rw-r--r-- | builtin/worktree.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c index 80d05e246d..476325ef98 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -320,7 +320,6 @@ static void copy_filtered_worktree_config(const char *worktree_git_dir) if (file_exists(from_file)) { struct config_set cs = { { 0 } }; - const char *core_worktree; int bare; if (safe_create_leading_directories(to_file) || @@ -339,7 +338,7 @@ static void copy_filtered_worktree_config(const char *worktree_git_dir) to_file, "core.bare", NULL, "true", 0)) error(_("failed to unset '%s' in '%s'"), "core.bare", to_file); - if (!git_configset_get_value(&cs, "core.worktree", &core_worktree) && + if (!git_configset_get(&cs, "core.worktree") && git_config_set_in_file_gently(to_file, "core.worktree", NULL)) error(_("failed to unset '%s' in '%s'"), |