Merge branch 'jk/git-shell-drop-cvsserver' into maint-2.10

diff --git a/worktree.c b/worktree.c
index 5acfe4cd64967d86462f3958433f3d2f844ead51..f7869f8d6072c98c3e9be3387a9a3c19508e13ea 100644 (file)
--- 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)) {