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

git:checkout-worktree: Echo non-zero exit code

Browse Source
This commit is contained in:
Julian Prein
2025-01-29 14:26:31 +01:00
parent 558bb0582e
commit c8c9d887f5
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,12 +54,14 @@ trap '
pushd -q "$WORKTREE_PATH" pushd -q "$WORKTREE_PATH"
"$SHELL" && errc=$? || errc=$? "$SHELL" && errc=$? || errc=$?
(( !errc )) || echo "shell exited with $errc"
# Restart the shell (forcefully interactive) until the worktree is removed # Restart the shell (forcefully interactive) until the worktree is removed
until [[ ! -e "$WORKTREE_PATH" ]] || git worktree remove "$WORKTREE_PATH"; do until [[ ! -e "$WORKTREE_PATH" ]] || git worktree remove "$WORKTREE_PATH"; do
[[ -t 0 ]] || [[ -t 0 ]] ||
>&2 printf "Dropping into interactive shell to resolve conflicts\n" >&2 printf "Dropping into interactive shell to resolve conflicts\n"
"$SHELL" -i && errc=$? || errc=$? "$SHELL" -i && errc=$? || errc=$?
(( !errc )) || echo "shell exited with $errc"
done done
# Reset traps and PWD # Reset traps and PWD