X-Git-Url: https://git.alrj.org/?p=zsh.d.git;a=blobdiff_plain;f=S60_git;h=7a9ba7a1d0fbd4f060530a8f2ab119fdcc3ea202;hp=54e61d477ad110bc101814a157c7fdf88db7c995;hb=f4c19f9d51cd05cb465aba57c336ebe8334013fc;hpb=d0ef5d562891701768a2b5cec34999fda2041b42

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=""