diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-05 10:49:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-05 10:49:49 -0700 |
| commit | 3256584c36f649abb2af58e7b190d3cf674ba56e (patch) | |
| tree | 032547196dd3036dbbbe315621782dcf804d486e /submodule.c | |
| parent | The fourteenth batch (diff) | |
| parent | config: allow tweaking whitespace between value and comment (diff) | |
| download | git-3256584c36f649abb2af58e7b190d3cf674ba56e.tar.gz git-3256584c36f649abb2af58e7b190d3cf674ba56e.zip | |
Merge branch 'rs/config-comment'
"git config" learned "--comment=<message>" option to leave a
comment immediately after the "variable = value" on the same line
in the configuration file.
* rs/config-comment:
config: allow tweaking whitespace between value and comment
config: fix --comment formatting
config: add --comment option to add a comment
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c index f0ddb31e8f..ce2d032521 100644 --- a/submodule.c +++ b/submodule.c @@ -2046,7 +2046,7 @@ void submodule_unset_core_worktree(const struct submodule *sub) submodule_name_to_gitdir(&config_path, the_repository, sub->name); strbuf_addstr(&config_path, "/config"); - if (git_config_set_in_file_gently(config_path.buf, "core.worktree", NULL)) + if (git_config_set_in_file_gently(config_path.buf, "core.worktree", NULL, NULL)) warning(_("Could not unset core.worktree setting in submodule '%s'"), sub->path); |