diff options
| author |  Stefan Beller <sbeller@google.com> | 2018-06-18 17:06:08 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-06-19 09:28:13 -0700 |
| commit | 984cd77ddbf0eea7371a18ad7124120473b6bb2d (patch) | |
| tree | 4747f5bc9053244ed9884d59d2bd983bf810c543 /builtin/submodule--helper.c | |
| parent | submodule: ensure core.worktree is set after update (diff) | |
| download | tgif-984cd77ddbf0eea7371a18ad7124120473b6bb2d.tar.xz | |
submodule deinit: unset core.worktree
When a submodule is deinit'd, the working tree is gone, so the setting of
core.worktree is bogus. Unset it.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/submodule--helper.c')
| -rw-r--r-- | builtin/submodule--helper.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index dffc55ed8e..1948090268 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -980,6 +980,8 @@ static void deinit_submodule(const char *path, const char *prefix, if (!(flags & OPT_QUIET)) printf(format, displaypath); + submodule_unset_core_worktree(sub); + strbuf_release(&sb_rm); } |