X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/05175deb43e4643176c377b9c7d2fe828c9dae30..99ce3c28e3d8483dbbbc5f798bb9c4e262af59a7:/.zsh/func/vcsh

diff --git a/.zsh/func/vcsh b/.zsh/func/vcsh
index 655c9ea..b9f4b5d 100755
--- a/.zsh/func/vcsh
+++ b/.zsh/func/vcsh
@@ -31,11 +31,17 @@ if [ ! -d "$FGIT_BASE/${1}.git" ]; then
   return 2
 fi
 
+old_GIT_DIR="${GIT_DIR:-}"
+old_GIT_WORK_TREE="${GIT_WORK_TREE:-}"
+
 export GIT_DIR="$FGIT_BASE/${1}.git"
-local _WORKTREE="$(git config --get core.worktree)"
-export GIT_WORK_TREE="$(readlink -f $GIT_DIR/$_WORKTREE)"
-unset _WORKTREE
+export GIT_WORK_TREE="$GIT_DIR/$(git config --get core.worktree)"
 
 git status
 
-PS1="%S{${0##*/}:$1}%s$PS1" $SHELL -i
+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