gitbash 0.2.2 → 0.2.3

package/commands/branch.sh

@@ -147,15 +147,15 @@ EOF
     # 3. Run fzf menu
     # -----------------------------
     local selection
-    selection=$(printf "%s\n" "$choices" \
-        | fzf --prompt="Branch action > " \
+    selection=$(fzf --prompt="Branch action > " \
               -i \
               --reverse \
               --border \
               --header="What would you like to do?" \
               --no-multi \
-              --bind=enter:accept
-    ) || true
+              --bind=enter:accept \
+              <<< "$choices"
+    ) </dev/tty || true
 
     # ESC or Ctrl-C
     if [[ -z "$selection" ]]; then

package/commands/cleanstash.sh

@@ -108,8 +108,7 @@ EOF
     # 3. Run fzf full-screen picker with preview (multi-select)
     # -----------------------------
     local selection
-    selection=$(printf "%s\n" "$choices" \
-        | fzf --prompt="Available stashes > " \
+    selection=$(fzf --prompt="Available stashes > " \
               -i \
               --reverse \
               --border \
@@ -123,8 +122,9 @@ EOF
                     else
                         echo "No preview";
                     fi
-              '
-    ) || true
+              ' \
+              <<< "$choices"
+    ) </dev/tty || true
 
     # ESC or Ctrl-C
     if [[ -z "$selection" ]]; then

package/commands/cleanup.sh

@@ -141,7 +141,7 @@ EOF
 
     # Get list of remote branches (without origin/ prefix)
     local remote_branches
-    remote_branches=$(git for-each-ref --format='%(refname:short)' refs/remotes/origin | sed 's|^origin/||' | grep -v '^HEAD$')
+    remote_branches=$(git for-each-ref --format='%(refname:short)' refs/remotes/origin | sed 's|^origin/||' | grep -v '^HEAD$' || true)
 
     # Arrays to hold branches by category (format: timestamp|branch|relative_date|author_email|author_name)
     local merged_branches=()
@@ -327,7 +327,7 @@ EOF
     toggle_sequence+="+first"
 
     local selection
-    selection=$(cat "$branch_file" | fzf \
+    selection=$(fzf \
         --prompt="Local branches to clean up > " \
         -i \
         --reverse \
@@ -351,8 +351,9 @@ Found $total_count branches ($preselect_count pre-selected for deletion)" \
             fi
         ' \
         --preview-window=right:35% \
-        --bind "load:$toggle_sequence"
-    ) || true
+        --bind "load:$toggle_sequence" \
+        < "$branch_file"
+    ) </dev/tty || true
 
     # Cleanup temp files
     rm -f "$branch_file" "$preselect_file"

package/commands/commits.sh

@@ -111,7 +111,7 @@ EOF
     # 4. Run fzf picker
     # -----------------------------
     local selection
-    selection=$(cat "$commit_file" | fzf \
+    selection=$(fzf \
         --prompt="Commits on '$current_branch' > " \
         -i \
         --reverse \
@@ -137,8 +137,9 @@ Showing last $count commits" \
                 git show --color=always "$hash" 2>/dev/null | head -100;
             fi
         ' \
-        --preview-window=right:50%
-    ) || true
+        --preview-window=right:50% \
+        < "$commit_file"
+    ) </dev/tty || true
 
     # Cleanup temp file
     rm -f "$commit_file"

package/commands/stale.sh

@@ -172,7 +172,7 @@ EOF
             fi
             # Format: display branch (padded), date, author, TAB, full branch name
             printf "%-${max_branch_length}s  %-20s %-25s\t%s\n" "$display_branch" "$date" "$author" "$full_branch"
-        done)
+        done || true)
     
     # Build stale branch list (only branches older than 3 months)
     local stale_branch_list
@@ -192,7 +192,7 @@ EOF
                 # Format: display branch (padded), date, author, TAB, full branch name
                 printf "%-${max_branch_length}s  %-20s %-25s\t%s\n" "$display_branch" "$date" "$author" "$full_branch"
             fi
-        done)
+        done || true)
 
     if [[ -z "$all_branch_list" ]]; then
         if [[ "$json_mode" == true ]]; then
@@ -246,7 +246,7 @@ EOF
                 
                 json_output+="{\"last_change_timestamp\":$timestamp,\"author_email\":\"$author_email\",\"author_name\":\"$author_name\",\"name\":\"$name\",\"last_change_relative\":\"$rel_date\"}"
             fi
-        done < <(git for-each-ref --sort=committerdate --format='%(refname:short)|%(committerdate:relative)|%(authorname)|%(authoremail)|%(committerdate:unix)' refs/remotes/origin 2>/dev/null | grep -v 'origin/HEAD' | grep -v '^origin$')
+        done < <(git for-each-ref --sort=committerdate --format='%(refname:short)|%(committerdate:relative)|%(authorname)|%(authoremail)|%(committerdate:unix)' refs/remotes/origin 2>/dev/null | grep -v 'origin/HEAD' | grep -v '^origin$' || true)
         } &>/dev/null
         json_output+="]"
         echo "$json_output"
@@ -314,7 +314,7 @@ HEADER_EOF
     
     local selection
     selection=$(
-        cat "$stale_file" | fzf \
+        fzf \
             --prompt="Stale branches (>3 months, oldest first) > " \
             --query="$filter" \
             -i \
@@ -340,8 +340,9 @@ Showing $stale_count stale branches (older than 3 months)" \
                     git log --oneline --color=always -n 15 "origin/$branch" 2>/dev/null || echo "No commits found";
                 fi
             ' \
-            --preview-window=right:35%
-    ) || true
+            --preview-window=right:35% \
+            < "$stale_file"
+    ) </dev/tty || true
     
     # Cleanup temp files
     rm -f "$stale_file" "$all_file" "$state_file" "$toggle_script" "$prompt_script" "$header_script"

package/commands/stale.zsh

@@ -168,7 +168,7 @@ EOF
             fi
             # Format: display branch (padded), date, author, TAB, full branch name
             printf "%-${max_branch_length}s  %-20s %-25s\t%s\n" "$display_branch" "$date" "$author" "$full_branch"
-        done)
+        done || true)
     
     # Build stale branch list (only branches older than 3 months)
     local stale_branch_list
@@ -188,7 +188,7 @@ EOF
                 # Format: display branch (padded), date, author, TAB, full branch name
                 printf "%-${max_branch_length}s  %-20s %-25s\t%s\n" "$display_branch" "$date" "$author" "$full_branch"
             fi
-        done)
+        done || true)
 
     if [[ -z "$all_branch_list" ]]; then
         if [[ "$json_mode" == true ]]; then
@@ -242,7 +242,7 @@ EOF
                 
                 json_output+="{\"last_change_timestamp\":$timestamp,\"author_email\":\"$author_email\",\"author_name\":\"$author_name\",\"name\":\"$name\",\"last_change_relative\":\"$rel_date\"}"
             fi
-        done < <(git for-each-ref --sort=committerdate --format='%(refname:short)|%(committerdate:relative)|%(authorname)|%(authoremail)|%(committerdate:unix)' refs/remotes/origin 2>/dev/null | grep -v 'origin/HEAD' | grep -v '^origin$')
+        done < <(git for-each-ref --sort=committerdate --format='%(refname:short)|%(committerdate:relative)|%(authorname)|%(authoremail)|%(committerdate:unix)' refs/remotes/origin 2>/dev/null | grep -v 'origin/HEAD' | grep -v '^origin$' || true)
         } &>/dev/null
         json_output+="]"
         echo "$json_output"
@@ -310,7 +310,7 @@ HEADER_EOF
     
     local selection
     selection=$(
-        cat "$stale_file" | fzf \
+        fzf \
             --prompt="Stale branches (>3 months, oldest first) > " \
             --query="$filter" \
             -i \
@@ -336,8 +336,9 @@ Showing $stale_count stale branches (older than 3 months)" \
                     git log --oneline --color=always -n 15 "origin/$branch" 2>/dev/null || echo "No commits found";
                 fi
             ' \
-            --preview-window=right:35%
-    )
+            --preview-window=right:35% \
+            < "$stale_file"
+    ) </dev/tty || true
     
     # Cleanup temp files
     rm -f "$stale_file" "$all_file" "$state_file" "$toggle_script" "$prompt_script" "$header_script"

package/commands/stashes.sh

@@ -146,15 +146,15 @@ EOF
     # 3. Run fzf menu
     # -----------------------------
     local selection
-    selection=$(printf "%s\n" "$choices" \
-        | fzf --prompt="Stash action > " \
+    selection=$(fzf --prompt="Stash action > " \
               -i \
               --reverse \
               --border \
               --header="What would you like to do?" \
               --no-multi \
-              --bind=enter:accept
-    ) || true
+              --bind=enter:accept \
+              <<< "$choices"
+    ) </dev/tty || true
 
     # ESC or Ctrl-C
     if [[ -z "$selection" ]]; then

package/commands/status.sh

@@ -129,7 +129,7 @@ EOF
   while true; do
     local selected_output
     selected_output=$(
-      echo "$status_output" | fzf \
+      fzf \
         --height=100% \
         -i \
         --reverse \
@@ -167,8 +167,9 @@ EOF
             git diff --color=always "$file" 2>/dev/null | delta 2>/dev/null || git diff --color=always "$file" 2>/dev/null;
           fi
         ' \
-        --preview-window=right:60%
-    ) || true
+        --preview-window=right:60% \
+        <<< "$status_output"
+    ) </dev/tty || true
 
     # Parse the key pressed and the selected files
     local key_pressed

package/commands/switch.sh

@@ -105,10 +105,11 @@ EOF
     if ! echo "$local_branches" | grep -qx "$local_name"; then
       echo "$remote"
     fi
-  done)
+  done || true)
   
   local selected_branch
-  selected_branch=$(
+  local branch_list
+  branch_list=$(
     {
       # List local branches
       echo "$local_branches" | sed 's/^/local: /'
@@ -118,7 +119,10 @@ EOF
         # List filtered remote branches
         echo "$remote_branches" | sed 's/^/remote: /'
       fi
-    } | fzf \
+    }
+  )
+  selected_branch=$(
+    fzf \
       --height=40% \
       --reverse \
       --border \
@@ -127,8 +131,9 @@ EOF
       -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="Current: $current_branch"
-  ) || true
+      --header="Current: $current_branch" \
+      <<< "$branch_list"
+  ) </dev/tty || true
 
   # -----------------------------
   # 4. Handle selection

package/commands/unstash.sh

@@ -111,8 +111,7 @@ EOF
     # 3. Run fzf full-screen picker with preview
     # -----------------------------
     local selection
-    selection=$(printf "%s\n" "$choices" \
-        | fzf --prompt="Available stashes > " \
+    selection=$(fzf --prompt="Available stashes > " \
               -i \
               --reverse \
               --border \
@@ -126,8 +125,9 @@ EOF
                     else
                         echo "No preview";
                     fi
-              '
-    ) || true
+              ' \
+              <<< "$choices"
+    ) </dev/tty || true
 
     # ESC or Ctrl-C
     if [[ -z "$selection" ]]; then

package/package.json

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