Fix git-worktree support