diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-01-18 13:49:53 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-18 13:49:53 -0800 |
commit | 3942920966b4392c52c09f66dda391d9c330f0f7 (patch) | |
tree | d1245dc0d86064a3450d1b08beb4207cf0f8458d /Documentation/git-check-attr.txt | |
parent | Merge branch 'ma/asciidoctor' (diff) | |
parent | submodule deinit: unset core.worktree (diff) | |
download | tgif-3942920966b4392c52c09f66dda391d9c330f0f7.tar.xz |
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
Diffstat (limited to 'Documentation/git-check-attr.txt')
0 files changed, 0 insertions, 0 deletions