gitbash 1.9.0 → 1.9.1

package/commands/switch.sh

@@ -159,7 +159,7 @@ EOF
       branches_file=$(mktemp)
       printf '%s\n' "$branch_list" > "$branches_file"
 
-    # Create a small helper script to delete the selected branch safely.
+    # Create a small helper script to delete the selected branch safely (asks for confirmation).
     delete_script=$(mktemp)
     cat > "$delete_script" <<'DEL_SH'
 #!/usr/bin/env bash
@@ -175,6 +175,24 @@ type="${line%%:*}"
 branch="${line#*: }"
 
 if [[ "$type" == "local" || "$type" == "merged" ]]; then
+  # Ask for confirmation via the terminal (/dev/tty). Default answer is Yes when empty.
+  while true; do
+    printf "Delete local branch '%s'? [Y/n]: " "$branch" > /dev/tty
+    read -r answer < /dev/tty
+    case "$answer" in
+      ''|[yY]|[yY][eE][sS])
+        break
+        ;;
+      [nN]|[nN][oO])
+        echo "Aborted deletion of $branch"
+        exit 0
+        ;;
+      *)
+        echo "Please answer y or n" > /dev/tty
+        ;;
+    esac
+  done
+
   if git branch -D "$branch"; then
     echo "Deleted local $branch"
     awk -v l="$line" '$0!=l' "$branches_file" > "$branches_file".new && mv "$branches_file".new "$branches_file"
@@ -196,12 +214,12 @@ DEL_SH
             --height=40% \
             --reverse \
             --border \
-            --expect=enter,delete,ctrl-d,ctrl-h,backspace \
+            --expect=enter,delete \
             --query="${filter_for_fzf:-$filter}" \
             -i \
             --preview="branch=\$(echo {} | sed 's/^[^:]*: //'); if [[ \"\$branch\" == *───* ]]; then echo 'Spacer - not selectable'; else git log --color=always -n 1 --format='%C(bold cyan)Author:%C(reset) %an%n%C(bold cyan)Date:%C(reset) %ar (%ad)%n%C(bold cyan)Message:%C(reset) %s%n' --date=format:'%Y-%m-%d %H:%M' \"\$branch\" 2>/dev/null && echo && git log --oneline --color=always -n 10 \"\$branch\" 2>/dev/null; fi" \
             --preview-window=right:50% \
-            --header="[Enter] switch | [Del/Ctrl-D] delete (local only) | [Esc] exit | Current: $current_branch" \
+            --header="[Enter] switch | [Del] delete (local only) | [Esc] exit | Current: $current_branch" \
             < "$branches_file"
         ) </dev/tty || true
 
@@ -219,7 +237,7 @@ DEL_SH
         break
       fi
 
-      if [[ "$key_pressed" == "delete" || "$key_pressed" == "ctrl-d" || "$key_pressed" == "ctrl-h" || "$key_pressed" == "backspace" ]]; then
+      if [[ "$key_pressed" == "delete" ]]; then
         # perform deletion on the selected line and continue loop
         if [[ -n "$selection" ]]; then
           "$delete_script" "$selection" "$branches_file"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitbash",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "Opinionated git utilities for bash with fzf-powered menus",
   "author": "jaggli",
   "license": "MIT",