druckdev/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git:checkout-worktree: s/REPO_DIR/WORKTREE_PATH/

Browse Source
This commit is contained in:
Julian Prein
2022-03-31 16:15:46 +02:00
parent 5a8b5ffd21
commit d56979362a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.config/zsh/autoload/git/git-checkout-worktree
View File

@@ -11,13 +11,13 @@
# TODO: If any conflicts arise, all further shells should be interactive instead # TODO: If any conflicts arise, all further shells should be interactive instead
# of looping forever. # of looping forever.
local REPO_NAME REPO_DIR local REPO_NAME WORKTREE_PATH
REPO_NAME="${$(git rev-parse --show-toplevel):t}" || return REPO_NAME="${$(git rev-parse --show-toplevel):t}" || return
REPO_DIR="$(mktemp -d -p "" "worktree.XXX.$REPO_NAME.$1")" WORKTREE_PATH="$(mktemp -d -p "" "worktree.XXX.$REPO_NAME.$1")"
git worktree add "$REPO_DIR" "$1" git worktree add "$WORKTREE_PATH" "$1"
[[ -e "$REPO_DIR" ]] || return 1 [[ -e "$WORKTREE_PATH" ]] || return 1
pushd -q "$REPO_DIR" pushd -q "$WORKTREE_PATH"
# Start subshell # Start subshell
"$SHELL" "$SHELL"
@@ -28,8 +28,8 @@ popd -q
# Restart the subshell until every issue is resolved and the worktree is # Restart the subshell until every issue is resolved and the worktree is
# removed # removed
until [[ ! -e "$REPO_DIR" ]] || git worktree remove "$REPO_DIR"; do until [[ ! -e "$WORKTREE_PATH" ]] || git worktree remove "$WORKTREE_PATH"; do
pushd -q "$REPO_DIR" pushd -q "$WORKTREE_PATH"
"$SHELL" "$SHELL"
errc=$? errc=$?
popd -q popd -q