restore old GIT_* variables on exit

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

diff --git a/.zsh/func/vcsh b/.zsh/func/vcsh
index cd6d2056c3b7d6082ae0ce262b1658a3ab78dea6..b9f4b5d174aca900a2128e327bc064a1c1d08636 100755 (executable)
--- a/.zsh/func/vcsh
+++ b/.zsh/func/vcsh
@@ -31,9 +31,17 @@ if [ ! -d "$FGIT_BASE/${1}.git" ]; then
   return 2
 fi
 
   return 2
 fi
 

+old_GIT_DIR="${GIT_DIR:-}"
+old_GIT_WORK_TREE="${GIT_WORK_TREE:-}"
+

 export GIT_DIR="$FGIT_BASE/${1}.git"
 export GIT_WORK_TREE="$GIT_DIR/$(git config --get core.worktree)"
 
 git status
 
 export GIT_DIR="$FGIT_BASE/${1}.git"
 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