X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/4749d4ded89ab2a937b2e525c0e0df751c760d27..3f60dca245acc7782d23e42f081bb4be4a050bbb:/.zsh/func/vcsh diff --git a/.zsh/func/vcsh b/.zsh/func/vcsh index e404efc..7a86068 100755 --- a/.zsh/func/vcsh +++ b/.zsh/func/vcsh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/zsh # # func/vcsh # @@ -7,14 +7,14 @@ # 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 # -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,7 +31,15 @@ if [ ! -d "$FGIT_BASE/${1}.git" ]; then return 2 fi -export GIT_DIR=$FGIT_BASE/${1}.git -git status +old_GIT_DIR="${GIT_DIR:-}" +old_GIT_WORK_TREE="${GIT_WORK_TREE:-}" -PS1="%S{VCSH:$1}%s$PS1" $SHELL -i +export GIT_DIR="$FGIT_BASE/${1}.git" +export GIT_WORK_TREE="$GIT_DIR/$(git config --get core.worktree)" + +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