X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/6698a8a0d2da74a08c95a2c5289e9e2e771efdee..99ce3c28e3d8483dbbbc5f798bb9c4e262af59a7:/.zsh/func/vcsh?ds=inline diff --git a/.zsh/func/vcsh b/.zsh/func/vcsh index ca26a9e..b9f4b5d 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,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" -_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{VCSH:$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