Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/zsh

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

diff --git a/.zsh/func/vcsh b/.zsh/func/vcsh
index 09597847227ee4ca06bea75b88aace5eddb7f805..c3c635750f1cab6606f125a5e28a170aa13ec16c 100755 (executable)
--- a/.zsh/func/vcsh
+++ b/.zsh/func/vcsh
@@ -10,28 +10,36 @@
 # 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' ]
-  exit $?
+  return $?
 
 elif [ "$1" = '-l' ]; then
   for i in $FGIT_BASE/*.git; do
     i="${i#$FGIT_BASE/}"
     echo "${i%.git}"
   done
-  exit 0
+  return 0
 fi
 
 if [ ! -d "$FGIT_BASE/${1}.git" ]; then
   echo E: no repository found for "$1" >&2
-  exit 2
+  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="{VCSH:$1}$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