diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-05-09 00:37:28 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-09 00:37:28 +0900 |
| commit | ec2642a2a127c192c2af239793a0f63f59845658 (patch) | |
| tree | 4455168d0eeccfe16bd7e5de4f4d2c1c3dc7a22f /builtin/am.c | |
| parent | Merge branch 'jk/untracked-cache-more-fixes' (diff) | |
| parent | worktree: update is_bare heuristics (diff) | |
| download | tgif-ec2642a2a127c192c2af239793a0f63f59845658.tar.xz | |
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
Diffstat (limited to 'builtin/am.c')
0 files changed, 0 insertions, 0 deletions