From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Jan 2019 21:49:53 +0000 (-0800)
Subject: Merge branch 'sb/submodule-unset-core-worktree-when-worktree-is-lost'
X-Git-Tag: v2.21.0-rc0~97
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3942920966b4392c52c09f66dda391d9c330f0f7;p=thirdparty%2Fgit.git

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
---

3942920966b4392c52c09f66dda391d9c330f0f7