From: Amand Tihon <amand.tihon@iba-group.com>
Date: Mon, 24 Jan 2011 09:36:04 +0000 (+0100)
Subject: Git prompt: Fix missing subdirectory
X-Git-Url: https://git.alrj.org/?p=zsh.d.git;a=commitdiff_plain;h=f4c19f9d51cd05cb465aba57c336ebe8334013fc

Git prompt: Fix missing subdirectory

When under .git, the prompt now shows the correct path to current
directory.
---

diff --git a/S60_git b/S60_git
index 54e61d4..7a9ba7a 100644
--- a/S60_git
+++ b/S60_git
@@ -95,10 +95,15 @@ git_parse() {
 
     git_dir=$(git rev-parse --git-dir 2> /dev/null) || return
 
-    base_dir=${$(readlink -f "$git_dir/..")/$HOME/'~'}
+    if [[ "$(git rev-parse --is-bare-repository)" == "true" ]]; then
+      base_dir=${$(readlink -f "$git_dir")/$HOME/'~'}
+      sub_dir=${$(pwd)#$(readlink -f "$git_dir")}
+    else
+      base_dir=${$(readlink -f "$git_dir/..")/$HOME/'~'}
+      sub_dir=${$(pwd)#$(readlink -f "$git_dir/..")}
+    fi
 
-    sub_dir=$(git rev-parse --show-prefix)
-    sub_dir=${sub_dir%/}
+    sub_dir=${sub_dir#/}
     ref=$(git symbolic-ref HEAD 2> /dev/null) || return
 
     action=""