diff options
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/submodule.c b/submodule.c index a2ce58e9e7..ed05339b58 100644 --- a/submodule.c +++ b/submodule.c @@ -22,6 +22,7 @@ #include "worktree.h" #include "parse-options.h" #include "object-store.h" +#include "commit-reach.h" static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF; static struct string_list changed_submodule_names = STRING_LIST_INIT_DUP; @@ -1534,18 +1535,6 @@ out: return ret; } -void submodule_unset_core_worktree(const struct submodule *sub) -{ - char *config_path = xstrfmt("%s/modules/%s/config", - get_git_common_dir(), sub->name); - - if (git_config_set_in_file_gently(config_path, "core.worktree", NULL)) - warning(_("Could not unset core.worktree setting in submodule '%s'"), - sub->path); - - free(config_path); -} - static const char *get_super_prefix_or_empty(void) { const char *s = get_super_prefix(); @@ -1711,8 +1700,6 @@ int submodule_move_head(const char *path, if (is_empty_dir(path)) rmdir_or_warn(path); - - submodule_unset_core_worktree(sub); } } out: |