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)
commit3942920966b4392c52c09f66dda391d9c330f0f7
treed1245dc0d86064a3450d1b08beb4207cf0f8458d
parent1ed943e9ae5172088654f25b0a35c8425eee9b2f
parent8eda5efa1269a6117b86a97a309eb3a195b5f087
Merge branch 'sb/submodule-unset-core-worktree-when-worktree-is-lost'

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
builtin/submodule--helper.c