diff options
author | Stefan Beller <sbeller@google.com> | 2018-12-14 15:59:45 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-12-26 10:39:54 -0800 |
commit | 8eda5efa1269a6117b86a97a309eb3a195b5f087 (patch) | |
tree | 15dd398c9b8d05d431988380b29866298a910185 /Documentation/RelNotes/2.17.2.txt | |
parent | submodule--helper: fix BUG message in ensure_core_worktree (diff) | |
download | tgif-8eda5efa1269a6117b86a97a309eb3a195b5f087.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. As we covered the only other case in
which a submodule loses its working tree in the earlier step
(i.e. switching branches of top-level project to move to a commit that did
not have the submodule), this makes the code always maintain
core.worktree correctly unset when there is no working tree
for a submodule.
This re-introduces 984cd77ddb (submodule deinit: unset core.worktree,
2018-06-18), which was reverted as part of f178c13fda (Revert "Merge
branch 'sb/submodule-core-worktree'", 2018-09-07)
The whole series was reverted as the offending commit e98317508c
(submodule: ensure core.worktree is set after update, 2018-06-18)
was relied on by other commits such as 984cd77ddb.
Keep the offending commit reverted, but its functionality came back via
4d6d6ef1fc (Merge branch 'sb/submodule-update-in-c', 2018-09-17), such
that we can reintroduce 984cd77ddb now.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/2.17.2.txt')
0 files changed, 0 insertions, 0 deletions