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

git:checkout-worktree: Mention non-interactive use

Browse Source
This commit is contained in:
Julian Prein
2022-03-31 15:43:49 +02:00
parent 02a0e17bcb
commit 976d3f9000
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,11 @@
# When the shell closes the worktree is tried to be removed. Until that works # When the shell closes the worktree is tried to be removed. Until that works
# without problems (e.g. dirty), a new shell is spawned to resolve all conflicts # without problems (e.g. dirty), a new shell is spawned to resolve all conflicts
# (e.g. stashing). Finally the temporary directory is deleted. # (e.g. stashing). Finally the temporary directory is deleted.
#
# Instead of dropping in an interactive shell, the commands to execute can be
# passed via stdin.
# TODO: If any conflicts arise, all further shells should be interactive instead
# of looping forever.
local GIT_ROOT TEMP_DIR REPO_DIR local GIT_ROOT TEMP_DIR REPO_DIR
GIT_ROOT="${$(git rev-parse --show-toplevel):t}" || return GIT_ROOT="${$(git rev-parse --show-toplevel):t}" || return