Merge branch 'jt/submodule-repo-is-with-worktree'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 May 2019 15:37:28 +0000 (00:37 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 May 2019 15:37:28 +0000 (00:37 +0900)
commitec2642a2a127c192c2af239793a0f63f59845658
tree4455168d0eeccfe16bd7e5de4f4d2c1c3dc7a22f
parent5b5def9a99030ecf2b62163ea7856f91cd8f292c
parentf3534c98e44c9f811742c7ea288e75d4baa3c27d
Merge branch 'jt/submodule-repo-is-with-worktree'

The logic to tell if a Git repository has a working tree protects
"git branch -D" from removing the branch that is currently checked
out by mistake.  The implementation of this logic was broken for
repositories with unusual name, which unfortunately is the norm for
submodules these days.  This has been fixed.

* jt/submodule-repo-is-with-worktree:
  worktree: update is_bare heuristics
worktree.c