X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/05175deb43e4643176c377b9c7d2fe828c9dae30..47bfbbfd7965fe91651dd485695855490f27e5e4:/.zsh/func/vcsh?ds=sidebyside diff --git a/.zsh/func/vcsh b/.zsh/func/vcsh index 655c9ea..7a86068 100755 --- a/.zsh/func/vcsh +++ b/.zsh/func/vcsh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/zsh # # func/vcsh # @@ -7,7 +7,7 @@ # Copyright © 1994–2008 martin f. krafft # Released under the terms of the Artistic Licence 2.0 # -# Source repository: http://git.madduck.net/v/etc/zsh.git +# Source repository: git://git.madduck.net/etc/zsh.git # local FGIT_BASE="$HOME/.fgits" @@ -31,11 +31,15 @@ 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