]> git.donarmstrong.com Git - zsh.git/commitdiff
fix branch detection
authormartin f. krafft <madduck@madduck.net>
Fri, 5 Feb 2010 02:06:13 +0000 (03:06 +0100)
committermartin f. krafft <madduck@madduck.net>
Fri, 5 Feb 2010 02:06:13 +0000 (03:06 +0100)
.zsh/zshrc/60_vcsprompt

index 07ea29388fdeba3ac45de18284ec9aa8eab6ef94..f9649fb5e44b9c650fabb85c77219e37de90ebd7 100644 (file)
@@ -26,9 +26,10 @@ __git_get_reporoot()
 __git_get_branch()
 {
   # return the name of the git branch we're on
-  local ref
-  ref=$(git --git-dir="$PWD" symbolic-ref -q HEAD 2>/dev/null \
-     || git --git-dir="$PWD" name-rev --name-only HEAD 2>/dev/null) || return 1
+  local ref gitdir
+  gitdir="$(git rev-parse --git-dir)"
+  ref=$(git --git-dir="$gitdir" symbolic-ref -q HEAD 2>/dev/null \
+     || git --git-dir="$gitdir" name-rev --name-only HEAD 2>/dev/null) || return 1
   echo "${ref#refs/heads/}"
 }