set GIT_WORK_TREE just to be sure

[etc/zsh.git] / .zsh / func / vcsh

diff --git a/.zsh/func/vcsh b/.zsh/func/vcsh
index 09597847227ee4ca06bea75b88aace5eddb7f805..ca26a9edd78390156bc6981af21b55af7ad07787 100755 (executable)
--- a/.zsh/func/vcsh
+++ b/.zsh/func/vcsh
@@ -16,22 +16,26 @@ if [ "${1:---help}" = '--help' ] || [ $# -gt 1 ]; then
   echo "usage: ${0%/*} reponame" >&2
   echo "usage: ${0%/*} -l" >&2
   [ "$1" = '--help' ]
   echo "usage: ${0%/*} reponame" >&2
   echo "usage: ${0%/*} -l" >&2
   [ "$1" = '--help' ]

-  exit $?
+  return $?

 
 elif [ "$1" = '-l' ]; then
   for i in $FGIT_BASE/*.git; do
     i="${i#$FGIT_BASE/}"
     echo "${i%.git}"
   done
 
 elif [ "$1" = '-l' ]; then
   for i in $FGIT_BASE/*.git; do
     i="${i#$FGIT_BASE/}"
     echo "${i%.git}"
   done

-  exit 0
+  return 0

 fi
 
 if [ ! -d "$FGIT_BASE/${1}.git" ]; then
   echo E: no repository found for "$1" >&2
 fi
 
 if [ ! -d "$FGIT_BASE/${1}.git" ]; then
   echo E: no repository found for "$1" >&2

-  exit 2
+  return 2

 fi
 
 fi
 

-export GIT_DIR=$FGIT_BASE/${1}.git
+export GIT_DIR="$FGIT_BASE/${1}.git"
+_WORKTREE="$(git config --get core.worktree)"
+export GIT_WORK_TREE="$(readlink -f $GIT_DIR/$_WORKTREE)"
+unset _WORKTREE
+

 git status
 
 git status
 

-PS1="{VCSH:$1}$PS1" $SHELL -i
+PS1="%S{VCSH:$1}%s$PS1" $SHELL -i