From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 May 2019 15:37:28 +0000 (+0900)
Subject: Merge branch 'jt/submodule-repo-is-with-worktree'
X-Git-Tag: v2.22.0-rc0~17
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ec2642a2a127c192c2af239793a0f63f59845658

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

ec2642a2a127c192c2af239793a0f63f59845658