From: martin f. krafft <madduck@madduck.net>
Date: Tue, 17 Jun 2008 08:19:15 +0000 (+0200)
Subject: restore old GIT_* variables on exit
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=99ce3c28e3d8483dbbbc5f798bb9c4e262af59a7;p=zsh.git

restore old GIT_* variables on exit
---

diff --git a/.zsh/func/vcsh b/.zsh/func/vcsh
index cd6d205..b9f4b5d 100755
--- a/.zsh/func/vcsh
+++ b/.zsh/func/vcsh
@@ -31,9 +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"
 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