make urlencode executable

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

diff --git a/.zsh/func/vcsh b/.zsh/func/vcsh
index 655c9ea3290ae06fdb02d25e453468f60a16fa10..c3c635750f1cab6606f125a5e28a170aa13ec16c 100755 (executable)
--- a/.zsh/func/vcsh
+++ b/.zsh/func/vcsh
@@ -31,11 +31,15 @@ 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_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