summaryrefslogtreecommitdiff
path: root/worktree.c
diff options
context:
space:
mode:
authorDennis Kaarsemaker <dennis@kaarsemaker.net>2016-10-12 16:41:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-14 16:58:58 (GMT)
commit171c646f8c6484cca76933ebe8a6af52df47277d (patch)
treedd23cd499840e8d6078295712da32a97e3344562 /worktree.c
parent74eeaf7b72a94bd3e0ff275edb90e6ee2423b529 (diff)
downloadgit-171c646f8c6484cca76933ebe8a6af52df47277d.zip
git-171c646f8c6484cca76933ebe8a6af52df47277d.tar.gz
git-171c646f8c6484cca76933ebe8a6af52df47277d.tar.bz2
worktree: allow the main brach of a bare repository to be checked out
In bare repositories, get_worktrees() still returns the main repository, so git worktree list can show it. ignore it in find_shared_symref so we can still check out the main branch. Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net> Acked-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'worktree.c')
-rw-r--r--worktree.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/worktree.c b/worktree.c
index 5acfe4c..f7869f8 100644
--- a/worktree.c
+++ b/worktree.c
@@ -345,6 +345,8 @@ const struct worktree *find_shared_symref(const char *symref,
for (i = 0; worktrees[i]; i++) {
struct worktree *wt = worktrees[i];
+ if (wt->is_bare)
+ continue;
if (wt->is_detached && !strcmp(symref, "HEAD")) {
if (is_worktree_being_rebased(wt, target)) {