gitbash 1.5.0 → 1.6.1

package/bin/gitbash

@@ -325,8 +325,11 @@ while [[ -L "$SOURCE" ]]; do
 done
 SCRIPT_DIR="$(cd -P "$(dirname "$SOURCE")/.." && pwd)"
 
+# Export so sourced command files can use it
+export SCRIPT_DIR
+
 COMMANDS_DIR="$SCRIPT_DIR/commands"
-VERSION="$(grep -o '"version": *"[^"]*"' "$SCRIPT_DIR/package.json" | cut -d'"' -f4)"
+VERSION="$(grep -o '"version": *"[^"]*"' "$SCRIPT_DIR/package.json" | head -1 | cut -d'"' -f4)"
 
 # Available commands
 COMMANDS=(

package/commands/branch.sh

@@ -152,25 +152,25 @@ EOF
     # -----------------------------
     case "$selection" in
         "$create_option")
-            # Source create.sh if create function not available
-            if ! declare -f create >/dev/null 2>&1; then
-                source "$SOURCE_DIR/create.sh"
+            # Use SCRIPT_DIR from parent or compute it
+            if [[ -z "${SCRIPT_DIR:-}" ]]; then
+              SCRIPT_DIR="$(cd "$SOURCE_DIR/.." && pwd)"
             fi
-            create
+            "$SCRIPT_DIR/bin/gitbash" create
             ;;
         "$switch_option")
-            # Source switch.sh if switch function not available
-            if ! declare -f switch >/dev/null 2>&1; then
-                source "$SOURCE_DIR/switch.sh"
+            # Use SCRIPT_DIR from parent or compute it
+            if [[ -z "${SCRIPT_DIR:-}" ]]; then
+              SCRIPT_DIR="$(cd "$SOURCE_DIR/.." && pwd)"
             fi
-            switch
+            "$SCRIPT_DIR/bin/gitbash" switch
             ;;
         "$update_option")
-            # Source update.sh if update function not available
-            if ! declare -f update >/dev/null 2>&1; then
-                source "$SOURCE_DIR/update.sh"
+            # Use SCRIPT_DIR from parent or compute it
+            if [[ -z "${SCRIPT_DIR:-}" ]]; then
+              SCRIPT_DIR="$(cd "$SOURCE_DIR/.." && pwd)"
             fi
-            update
+            "$SCRIPT_DIR/bin/gitbash" update
             ;;
         "$abort_label")
             echo "Aborted."

package/commands/pr.sh

@@ -71,6 +71,59 @@ EOF
     return 1
   fi
 
+  # Check for uncommitted changes or untracked files
+  local has_changes=false
+  if ! git diff-index --quiet HEAD -- 2>/dev/null || [[ -n "$(git ls-files --others --exclude-standard)" ]]; then
+    has_changes=true
+  fi
+  
+  if [[ "$has_changes" == true ]]; then
+    echo "You have uncommitted changes or untracked files."
+    echo ""
+    
+    # Source _utils.sh for prompt_read
+    if ! declare -f prompt_read >/dev/null 2>&1; then
+      SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+      source "$SOURCE_DIR/_utils.sh"
+    fi
+    
+    prompt_read "Would you like to commit them first? (Y/n): " commit_answer
+    case "$commit_answer" in
+      [nN][oO]|[nN])
+        echo "Continuing without committing..."
+        ;;
+      *)
+        # Use SCRIPT_DIR from parent or compute it
+        if [[ -z "${SCRIPT_DIR:-}" ]]; then
+          SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+          SCRIPT_DIR="$(cd "$SOURCE_DIR/.." && pwd)"
+        fi
+        
+        # Run status command for interactive staging and committing
+        "$SCRIPT_DIR/bin/gitbash" status
+        if [[ $? -ne 0 ]]; then
+          echo "Commit cancelled or failed. Aborting PR creation."
+          return 1
+        fi
+        
+        # If -p wasn't specified, offer to push the fresh commit
+        if [[ "$should_push" != true ]]; then
+          echo ""
+          prompt_read "Push the fresh commit to origin? (Y/n): " push_answer
+          case "$push_answer" in
+            [nN][oO]|[nN])
+              echo "Continuing without pushing..."
+              ;;
+            *)
+              should_push=true
+              ;;
+          esac
+        fi
+        ;;
+    esac
+    echo ""
+  fi
+
   # Remote URL (e.g. git@github.com:user/repo.git or https://github.com/user/repo.git)
   remote=$(git config --get remote.origin.url)
 

package/commands/stale.sh

@@ -237,12 +237,12 @@ EOF
             echo "$str"
         }
         
-        # Build JSON from stale branches
+        # Build JSON from branches (all or stale based on --all flag)
         {
         while IFS='|' read -r branch rel_date author_name author_email timestamp; do
             [[ -z "$branch" ]] && continue
-            # Only include if older than 3 months
-            if [[ "$timestamp" -lt "$threshold_ago" ]]; then
+            # Include based on all_mode flag
+            if [[ "$all_mode" == true ]] || [[ "$timestamp" -lt "$threshold_ago" ]]; then
                 local name="${branch#origin/}"
                 # Remove angle brackets from email
                 author_email="${author_email#<}"
@@ -273,10 +273,14 @@ EOF
     local stale_file=$(mktemp)
     local all_file=$(mktemp)
     local state_file=$(mktemp)
+    local toggle_script=$(mktemp)
+    
+    # Ensure cleanup on exit
+    trap 'rm -f "$stale_file" "$all_file" "$state_file" "$toggle_script"' EXIT INT TERM
     
     # Write stale branches with header
     {
-        echo "══ Stale branches (>${stale_months}mo, oldest first) ══"
+        echo "══ Stale branches (>${stale_months}mo, oldest first) ══ [TAB] select | [Ctrl-A] toggle all/stale | [Enter] delete | [ESC] exit"
         if [[ -n "$stale_branch_list" ]]; then
             echo "$stale_branch_list"
         fi
@@ -285,7 +289,7 @@ EOF
     
     # Write all branches with header
     {
-        echo "══ All branches (oldest first) ══"
+        echo "══ All branches (oldest first) ══ [TAB] select | [Ctrl-A] toggle all/stale | [Enter] delete | [ESC] exit"
         if [[ -n "$all_branch_list" ]]; then
             echo "$all_branch_list"
         fi
@@ -305,8 +309,7 @@ EOF
     local stale_count=$(echo "$stale_branch_list" | grep -c . || echo "0")
     local all_count=$(echo "$all_branch_list" | grep -c . || echo "0")
     
-    # Create toggle script  
-    local toggle_script=$(mktemp)
+    # Create toggle script
     cat > "$toggle_script" << TOGGLE_EOF
 #!/bin/bash
 state=\$(cat "$state_file" | tr -d '\n')
@@ -338,7 +341,6 @@ TOGGLE_EOF
             -i \
             --reverse \
             --border \
-            --header="[TAB] select | [Ctrl-A] toggle all/stale | [Enter] delete | [ESC] exit" \
             --header-lines=1 \
             --multi \
             --delimiter=$'\t' \
@@ -361,9 +363,6 @@ TOGGLE_EOF
             --preview-window=right:35% \
             < "$initial_input_file"
     ) </dev/tty || true
-    
-    # Cleanup temp files
-    rm -f "$stale_file" "$all_file" "$state_file" "$toggle_script" "$prompt_script" "$header_script"
 
     # ESC or Ctrl-C
     if [[ -z "$selection" ]]; then

package/commands/stashes.sh

@@ -151,25 +151,25 @@ EOF
     # -----------------------------
     case "$selection" in
         "$stash_option")
-            # Source stash.sh if stash function not available
-            if ! declare -f stash >/dev/null 2>&1; then
-                source "$SOURCE_DIR/stash.sh"
+            # Use SCRIPT_DIR from parent or compute it
+            if [[ -z "${SCRIPT_DIR:-}" ]]; then
+              SCRIPT_DIR="$(cd "$SOURCE_DIR/.." && pwd)"
             fi
-            stash
+            "$SCRIPT_DIR/bin/gitbash" stash
             ;;
         "$unstash_option")
-            # Source unstash.sh if unstash function not available
-            if ! declare -f unstash >/dev/null 2>&1; then
-                source "$SOURCE_DIR/unstash.sh"
+            # Use SCRIPT_DIR from parent or compute it
+            if [[ -z "${SCRIPT_DIR:-}" ]]; then
+              SCRIPT_DIR="$(cd "$SOURCE_DIR/.." && pwd)"
             fi
-            unstash
+            "$SCRIPT_DIR/bin/gitbash" unstash
             ;;
         "$cleanup_option")
-            # Source cleanstash.sh if cleanstash function not available
-            if ! declare -f cleanstash >/dev/null 2>&1; then
-                source "$SOURCE_DIR/cleanstash.sh"
+            # Use SCRIPT_DIR from parent or compute it
+            if [[ -z "${SCRIPT_DIR:-}" ]]; then
+              SCRIPT_DIR="$(cd "$SOURCE_DIR/.." && pwd)"
             fi
-            cleanstash
+            "$SCRIPT_DIR/bin/gitbash" cleanstash
             ;;
         "$abort_label")
             echo "Aborted."

package/commands/status.sh

@@ -131,20 +131,31 @@ EOF
             bat --color=always --style=numbers --theme=\"GitHub\" "$file" 2>/dev/null || cat "$file" 2>/dev/null || echo "Cannot preview file";
           elif [[ "$file_status" =~ ^[MAC] ]]; then
             # Staged file - show cached diff
-            echo "=== STAGED CHANGES ===";
-            echo;
-            git diff --cached --color=always "$file" 2>/dev/null | delta --light 2>/dev/null || git diff --cached --color=always "$file" 2>/dev/null;
-            if git diff --color=always "$file" 2>/dev/null | grep -q .; then
+            staged_diff=$(git diff --cached --color=always "$file" 2>/dev/null);
+            unstaged_diff=$(git diff --color=always "$file" 2>/dev/null);
+            
+            # Only show staged section if there are staged changes
+            if [[ -n "$staged_diff" ]]; then
+              echo "=== STAGED CHANGES ===";
               echo;
+              echo "$staged_diff" | delta --light 2>/dev/null || echo "$staged_diff";
+            fi
+            
+            # Only show unstaged section if there are unstaged changes
+            if [[ -n "$unstaged_diff" ]]; then
+              [[ -n "$staged_diff" ]] && echo;
               echo "=== UNSTAGED CHANGES ===";
               echo;
-              git diff --color=always "$file" 2>/dev/null | delta --light 2>/dev/null || git diff --color=always "$file" 2>/dev/null;
+              echo "$unstaged_diff" | delta --light 2>/dev/null || echo "$unstaged_diff";
             fi
           else
             # Unstaged changes
-            echo "=== UNSTAGED CHANGES ===";
-            echo;
-            git diff --color=always "$file" 2>/dev/null | delta --light 2>/dev/null || git diff --color=always "$file" 2>/dev/null;
+            unstaged_diff=$(git diff --color=always "$file" 2>/dev/null);
+            if [[ -n "$unstaged_diff" ]]; then
+              echo "=== UNSTAGED CHANGES ===";
+              echo;
+              echo "$unstaged_diff" | delta --light 2>/dev/null || echo "$unstaged_diff";
+            fi
           fi
         ' \
         --preview-window=right:60% \
@@ -295,12 +306,12 @@ EOF
       echo "Ready to commit and push staged changes."
       echo "Press Ctrl+C to abort."
       echo
-      # Source commit.sh if commit function not available
-      if ! declare -f commit >/dev/null 2>&1; then
-        source "$SOURCE_DIR/commit.sh"
+      # Use SCRIPT_DIR from parent or compute it
+      if [[ -z "${SCRIPT_DIR:-}" ]]; then
+        SCRIPT_DIR="$(cd "$SOURCE_DIR/.." && pwd)"
       fi
       # Directly prompt for commit message (user can Ctrl+C to abort)
-      commit -s -p
+      "$SCRIPT_DIR/bin/gitbash" commit -s -p
       break
     fi
   done

package/commands/switch.sh

@@ -110,7 +110,9 @@ EOF
     local matching_branches
     matching_branches=$(echo "$branch_list" | grep -iv '───' | grep -i "$filter" || true)
     local match_count
-    match_count=$(echo "$matching_branches" | grep -c . || echo "0")
+    match_count=$(echo "$matching_branches" | grep -c . 2>/dev/null || echo "0")
+    # Ensure match_count is numeric
+    [[ -z "$match_count" ]] && match_count=0
     
     if [[ "$match_count" -eq 1 ]]; then
       # Single match - skip fzf

package/commands/unstash.sh

@@ -146,17 +146,17 @@ EOF
     fi
 
     # -----------------------------
-    # 6. Confirm before dropping
+    # 6. Confirm before dropping (default: Yes)
     # -----------------------------
     echo
-    prompt_read "Drop $stash_id now? (y/N): " drop_ans
+    prompt_read "Drop $stash_id now? (Y/n): " drop_ans
     case "$drop_ans" in
-        [yY][eE][sS]|[yY])
-            echo "Dropping $stash_id ..."
-            git stash drop "$stash_id"
+        [nN][oO]|[nN])
+            echo "Stash NOT dropped."
             ;;
         *)
-            echo "Stash NOT dropped."
+            echo "Dropping $stash_id ..."
+            git stash drop "$stash_id"
             ;;
     esac
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitbash",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "description": "Opinionated git utilities for bash with fzf-powered menus",
   "author": "jaggli",
   "license": "MIT",
@@ -43,7 +43,7 @@
   "scripts": {
     "changeset": "changeset",
     "version": "changeset version",
-    "release": "changeset publish"
+    "release": "npm run version && VERSION=$(node -p \"require('./package.json').version\") && git tag \"v$VERSION\" && ./bin/gitbash commit -p \"chore: release v$VERSION\" && git push --tags && npm publish"
   },
   "devDependencies": {
     "@changesets/cli": "^2.29.8"