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

git🐮 Fix stderr redirection

Browse Source 
I also swapped the printf and the redirection since I think I prefer it
this way.
This commit is contained in:
Julian Prein
2025-09-21 01:34:48 +02:00
parent 2dd1a80036
commit 1c5beed613
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ fi
trap ' trap '
errc=$? errc=$?
<&2 printf "Exiting abnormally. Check and possibly remove \"%s\" manually.\n" "'"$WORKTREE_PATH"'" printf >&2 "Exiting abnormally. Check and possibly remove \"%s\" manually.\n" "'"$WORKTREE_PATH"'"
return $errc return $errc
' INT QUIT TERM EXIT ' INT QUIT TERM EXIT
@@ -77,7 +77,7 @@ unset GIT_PREFIX
# 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" printf >&2 "Dropping into interactive shell to resolve conflicts\n"
"$SHELL" -i && errc=$? || errc=$? "$SHELL" -i && errc=$? || errc=$?
(( !errc )) || echo "shell exited with $errc" (( !errc )) || echo "shell exited with $errc"
done done