]> git.madduck.net Git - etc/zsh.git/blobdiff - .zsh/func/vcsh

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

add mdtest alias for swaks
[etc/zsh.git] / .zsh / func / vcsh
index 0a08b5e31d3d541b8f0126678bb7eeeebcbb93a9..b9f4b5d174aca900a2128e327bc064a1c1d08636 100755 (executable)
@@ -13,8 +13,8 @@
 local FGIT_BASE="$HOME/.fgits"
 
 if [ "${1:---help}" = '--help' ] || [ $# -gt 1 ]; then
 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 $?
 
   [ "$1" = '--help' ]
   return $?
 
@@ -31,11 +31,17 @@ 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
 
 
 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