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

git:checkout-worktree: Remove tmp dir on error

Browse Source 
When the git-worktree call exits with an error we can delete the
temporary directory as nothing is in it.
This commit is contained in:
Julian Prein
2022-10-27 23:52:17 +02:00
parent d1f51c0889
commit b22085777e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,13 +30,19 @@ local REPO_NAME WORKTREE_PATH
REPO_NAME="${$(git rev-parse --show-toplevel):t}" REPO_NAME="${$(git rev-parse --show-toplevel):t}"
WORKTREE_PATH="$(mktemp -d -p "" "worktree.XXX.$REPO_NAME.${1//\//_}")" WORKTREE_PATH="$(mktemp -d -p "" "worktree.XXX.$REPO_NAME.${1//\//_}")"
git worktree add "$WORKTREE_PATH" "$@" || ret=$?
if (( ret )); then
rmdir "$WORKTREE_PATH"
return $ret
fi
trap ' trap '
errc=$? errc=$?
<&2 printf "Exiting abnormally. Check and possibly remove '$WORKTREE_PATH' manually.\n" <&2 printf "Exiting abnormally. Check and possibly remove '$WORKTREE_PATH' manually.\n"
return $errc return $errc
' INT QUIT TERM EXIT ' INT QUIT TERM EXIT
git worktree add "$WORKTREE_PATH" "$@"
pushd -q "$WORKTREE_PATH" pushd -q "$WORKTREE_PATH"
"$SHELL" && errc=$? || errc=$? "$SHELL" && errc=$? || errc=$?