Merge branch 'sb/submodule-unset-core-worktree-when-worktree-is-lost'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Jan 2019 21:49:53 +0000 (13:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Jan 2019 21:49:53 +0000 (13:49 -0800)
The core.worktree setting in a submodule repository should not be
pointing at a directory when the submodule loses its working tree
(e.g. getting deinit'ed), but the code did not properly maintain
this invariant.

* sb/submodule-unset-core-worktree-when-worktree-is-lost:
  submodule deinit: unset core.worktree
  submodule--helper: fix BUG message in ensure_core_worktree
  submodule: unset core.worktree if no working tree is present
  submodule update: add regression test with old style setups

1  2 
builtin/submodule--helper.c

Simple merge