X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/4749d4ded89ab2a937b2e525c0e0df751c760d27..1eff3f3673d73739a8ee6f32d4ee1f7b36817013:/.zsh/func/vcsh?ds=sidebyside

diff --git a/.zsh/func/vcsh b/.zsh/func/vcsh
index e404efc..c3c6357 100755
--- a/.zsh/func/vcsh
+++ b/.zsh/func/vcsh
@@ -10,11 +10,11 @@
 # Source repository: http://git.madduck.net/v/etc/zsh.git
 #
 
-FGIT_BASE="$HOME/.fgits"
+local FGIT_BASE="$HOME/.fgits"
 
 if [ "${1:---help}" = '--help' ] || [ $# -gt 1 ]; then
-  echo "usage: ${0%/*} reponame" >&2
-  echo "usage: ${0%/*} -l" >&2
+  echo "usage: ${0##*/} reponame" >&2
+  echo "usage: ${0##*/} -l" >&2
   [ "$1" = '--help' ]
   return $?
 
@@ -31,7 +31,15 @@ if [ ! -d "$FGIT_BASE/${1}.git" ]; then
   return 2
 fi
 
-export GIT_DIR=$FGIT_BASE/${1}.git
-git status
+old_GIT_DIR="${GIT_DIR:-}"
+old_GIT_WORK_TREE="${GIT_WORK_TREE:-}"
 
-PS1="%S{VCSH:$1}%s$PS1" $SHELL -i
+export GIT_DIR="$FGIT_BASE/${1}.git"
+export GIT_WORK_TREE="$GIT_DIR/$(git config --get core.worktree)"
+
+PS1="%S{${0##*/}:$1}%s$PS1" $SHELL -i || :
+
+GIT_DIR="$old_GIT_DIR"
+[ -z "$GIT_DIR" ] && unset GIT_DIR
+GIT_WORK_TREE="$old_GIT_WORK_TREE"
+[ -z "$GIT_WORK_TREE" ] && unset GIT_WORK_TREE