From 9a2d1d6790f71b83d8b7b990b318178b92661170 Mon Sep 17 00:00:00 2001
From: Dom Sekotill <dom@kodo.org.uk>
Date: Thu, 24 Nov 2016 14:58:04 +0000
Subject: [PATCH] Test only for the presence of a .git directory in
 virtualenvwrapper

Instead of using both $(git rev-parse --show-toplevel) and a check for
a .git directory, use just the latter. As well as being redundant
the former does not work quite so well when using multiple worktrees;
each worktree will be treated as a separate project.
---
 .../virtualenvwrapper/virtualenvwrapper.plugin.zsh | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 6cd30732..63cc7b4f 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -36,27 +36,19 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
   function workon_cwd {
     if [[ -z "$WORKON_CWD" ]]; then
       local WORKON_CWD=1
-      # Check if this is a Git repo
-      local GIT_REPO_ROOT=""
-      local GIT_TOPLEVEL="$(git rev-parse --show-toplevel 2> /dev/null)"
-      if [[ $? == 0 ]]; then
-        GIT_REPO_ROOT="$GIT_TOPLEVEL"
-      fi
       # Get absolute path, resolving symlinks
       local PROJECT_ROOT="${PWD:A}"
       while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" \
-               && ! -d "$PROJECT_ROOT/.git"  && "$PROJECT_ROOT" != "$GIT_REPO_ROOT" ]]; do
+          && ! -d "$PROJECT_ROOT/.git" ]]; do
         PROJECT_ROOT="${PROJECT_ROOT:h}"
       done
-      if [[ "$PROJECT_ROOT" == "/" ]]; then
-        PROJECT_ROOT="."
-      fi
+
       # Check for virtualenv name override
       if [[ -f "$PROJECT_ROOT/.venv" ]]; then
         ENV_NAME="$(cat "$PROJECT_ROOT/.venv")"
       elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
         ENV_NAME="$PROJECT_ROOT/.venv"
-      elif [[ "$PROJECT_ROOT" != "." ]]; then
+      elif [[ "$PROJECT_ROOT" != "/" ]]; then
         ENV_NAME="${PROJECT_ROOT:t}"
       else
         ENV_NAME=""