native macOS codings agent orchestrator
update git-wt
+17
-14
+17
-14
Resources/git-wt/wt
+17
-14
Resources/git-wt/wt
···
694
694
if [ "$path" = "$root" ]; then
695
695
die "cannot remove main worktree"
696
696
fi
697
-
local dirty
698
-
dirty=$(git -C "$path" status --porcelain)
699
-
if [ -n "$dirty" ] && [ "$force" -eq 0 ]; then
700
-
if [ -t 0 ]; then
701
-
printf "workspace '%s' has uncommitted changes. remove anyway? [y/N] " "$branch" >&2
702
-
read -r answer
703
-
case "$answer" in
704
-
y | Y | yes | YES) force=1 ;;
705
-
*) exit 1 ;;
706
-
esac
707
-
else
708
-
die "workspace dirty: '$branch'"
697
+
if [ "$force" -eq 0 ]; then
698
+
local dirty
699
+
dirty=$(git -C "$path" status --porcelain)
700
+
if [ -n "$dirty" ]; then
701
+
if [ -t 0 ]; then
702
+
printf "workspace '%s' has uncommitted changes. remove anyway? [y/N] " "$branch" >&2
703
+
read -r answer
704
+
case "$answer" in
705
+
y | Y | yes | YES) force=1 ;;
706
+
*) exit 1 ;;
707
+
esac
708
+
else
709
+
die "workspace dirty: '$branch'"
710
+
fi
709
711
fi
710
712
fi
711
713
if [ "$force" -eq 1 ]; then
712
-
git -C "$root" worktree remove --force "$path"
714
+
git -C "$root" worktree remove --force "$path" 2>/dev/null || true
715
+
command rm -rf "$path" 2>/dev/null || true
713
716
else
714
717
git -C "$root" worktree remove "$path"
715
718
fi
716
719
if [ "$force" -eq 1 ]; then
717
-
git -C "$root" branch -D "$branch"
720
+
git -C "$root" branch -D "$branch" 2>/dev/null || true
718
721
else
719
722
git -C "$root" branch -d "$branch"
720
723
fi