gitbash 1.3.3 → 1.3.5

package/README.md

@@ -40,8 +40,17 @@ gitbash reads configuration from `~/.gitbashrc` if it exists. You can set the fo
 # Prefix for feature branches (default: "feature/")
 GITBASH_FEATURE_BRANCH_PREFIX="feature/"
 
-# Command for merging (default: "merge")
-GITBASH_MERGE_COMMAND="merge"
+# Merge tool command invoked by 'update' when conflicts occur (default: "fork")
+GITBASH_MERGE_COMMAND="fork"
+
+# Theme for delta/bat diff highlighting: auto, dark, or light (default: "light")
+GITBASH_THEME="light"
+
+# Stale branch threshold in months for 'stale' command (default: 3)
+GITBASH_STALE_MONTHS=3
+
+# Cleanup threshold in days - branches merged more than this many days ago (default: 7)
+GITBASH_CLEANUP_DAYS=7
 ```
 
 You can create this file manually or use `gitbash --config` to configure interactively.
@@ -121,13 +130,15 @@ Merge latest main/master into current branch. Opens merge tool on conflicts.
 ### stale
 
 ```bash
-stale [-m|--my] [--json] [FILTER...]
+stale [-a|--all] [--age=N] [--json] [FILTER...]
 ```
 
 List remote branches >3 months old (oldest first). Multi-select with TAB to delete.
 
-- `Ctrl-A` toggles showing all branches
-- `--my` filters by your git username
+- By default, pre-filters by your git username (from `git config user.name`)
+- `-a|--all` shows all branches without username filter
+- `--age=N` sets stale threshold in months (default: 3, or `GITBASH_STALE_MONTHS`)
+- `Ctrl-A` toggles showing all branches (including recent ones)
 - `--json` outputs JSON for scripting (same format as cleanup)
 
 ### stashes

package/commands/cleanstash.sh

@@ -126,9 +126,9 @@ EOF
     # 4. Extract stash IDs safely
     # -----------------------------
     local stash_ids=()
+    local stash_id line
     while IFS= read -r line; do
-        local stash_id
-        stash_id=$(echo "$line" | grep -o 'stash@{[0-9]\+}')
+        stash_id=$(echo "$line" | grep -o 'stash@{[0-9]\+}' || true)
         if [[ -n "$stash_id" ]]; then
             stash_ids+=("$stash_id")
         fi
@@ -157,6 +157,7 @@ EOF
             echo "Deleting stashes..."
             # Sort by stash number in descending order to delete safely
             local sorted_ids=()
+            local id
             while IFS= read -r id; do
                 sorted_ids+=("$id")
             done < <(printf '%s\n' "${stash_ids[@]}" | sort -t'{' -k2 -rn)

package/commands/cleanup.sh

@@ -163,6 +163,10 @@ EOF
     stale_branches=()
     recent_branches=()
 
+    # Variables for loop (declared once to avoid zsh output on redeclaration)
+    local last_commit_ts relative_date author_email author_name
+    local has_remote configured_upstream entry
+
     # Process each local branch
     while IFS= read -r branch; do
         # Skip base branch
@@ -170,24 +174,22 @@ EOF
         [[ -z "$branch" ]] && continue
 
         # Get last commit info for all branches
-        local last_commit_ts relative_date author_email author_name
         last_commit_ts=$(git log -1 --format='%ct' "$branch" 2>/dev/null)
         relative_date=$(git log -1 --format='%cr' "$branch" 2>/dev/null)
         author_email=$(git log -1 --format='%ae' "$branch" 2>/dev/null)
         author_name=$(git log -1 --format='%an' "$branch" 2>/dev/null)
         
         # Check if remote branch exists
-        local has_remote=false
+        has_remote=false
         if echo "$remote_branches" | grep -qx "$branch"; then
             has_remote=true
         fi
 
         # Check if it HAD an upstream (was pushed before)
-        local configured_upstream
         configured_upstream=$(git config "branch.$branch.remote" 2>/dev/null)
 
         # Entry format: timestamp|branch|relative_date|author_email|author_name
-        local entry="$last_commit_ts|$branch|$relative_date|$author_email|$author_name"
+        entry="$last_commit_ts|$branch|$relative_date|$author_email|$author_name"
 
         if [[ "$has_remote" == false && -n "$configured_upstream" ]]; then
             # Had upstream but remote is gone = merged and deleted remotely
@@ -205,9 +207,9 @@ EOF
     _sort_desc() {
         local _var="$1"
         shift
-        local _out=()
-        while IFS= read -r line; do
-            _out+=("$line")
+        local _out=() _line
+        while IFS= read -r _line; do
+            _out+=("$_line")
         done < <(printf '%s\n' "$@" | sort -t'|' -k1 -rn)
         # shellcheck disable=SC2034  # assigned via eval to caller var
         eval "$_var=(\"\${_out[@]}\")"
@@ -427,10 +429,10 @@ Found $total_count branches ($preselect_count pre-selected for deletion)" \
     local branches_to_delete=()
     local need_switch=false
     local only_merged=true
+    local branch_name line
 
     while IFS= read -r line; do
         [[ "$line" == "✖ Abort"* ]] && continue
-        local branch_name
         branch_name=$(echo "$line" | cut -f2)
         if [[ -n "$branch_name" ]]; then
             branches_to_delete+=("$branch_name")

package/commands/create.sh

@@ -196,13 +196,13 @@ TYPES
         print_info "No Jira link provided. Using NOISSUE."
     else
         # First try to match just the issue number pattern (e.g., PROJ-123)
-        issue_number=$(echo "$jira_link" | grep -o -E '^[A-Z]+-[0-9]+$' | head -1)
+        issue_number=$(echo "$jira_link" | grep -o -E '^[A-Z]+-[0-9]+$' | head -1 || true)
         
         # If not a direct match, try to extract from URL
         if [[ -z "$issue_number" ]]; then
             # Match patterns like PROJ-123, ABC-456, etc.
             # Supports both /browse/PROJ-123 and selectedIssue=PROJ-123 formats
-            issue_number=$(echo "$jira_link" | grep -o -E '(browse/|selectedIssue=)[A-Z]+-[0-9]+' | grep -o '[A-Z]\+-[0-9]\+' | head -1)
+            issue_number=$(echo "$jira_link" | grep -o -E '(browse/|selectedIssue=)[A-Z]+-[0-9]+' | grep -o '[A-Z]\+-[0-9]\+' | head -1 || true)
         fi
 
         if [[ -z "$issue_number" ]]; then
@@ -218,7 +218,6 @@ TYPES
             echo "Parsed issue number: $issue_number"
         fi
     fi
-    echo
 
     # -----------------------------
     # 3. Get branch title from user (if not already provided)
@@ -242,9 +241,7 @@ TYPES
     # branch_prefix is set earlier from type menu, flag, or config
     local branch_name="${branch_prefix}${issue_number}-${branch_title}"
     
-    echo
     echo "Branch name: $branch_name"
-    echo
 
     # -----------------------------
     # 5. Check if branch already exists

package/commands/switch.sh

@@ -136,10 +136,13 @@ EOF
   # -----------------------------
   # 5. Switch to branch
   # -----------------------------
+  local switch_success=false
   if [[ "$branch_type" == "local" ]]; then
     # Switch to local branch
     echo "Switching to local branch: $branch_name"
-    git checkout "$branch_name"
+    if git checkout "$branch_name"; then
+      switch_success=true
+    fi
   else
     # Handle remote branch
     local local_branch="${branch_name#*/}"  # Remove origin/ prefix
@@ -147,15 +150,52 @@ EOF
     # Check if local branch already exists
     if git show-ref --verify --quiet "refs/heads/$local_branch"; then
       echo "Switching to existing local branch: $local_branch"
-      git checkout "$local_branch"
+      if git checkout "$local_branch"; then
+        switch_success=true
+      fi
     else
       echo "Creating local tracking branch: $local_branch (tracking $branch_name)"
-      git checkout -b "$local_branch" --track "$branch_name"
+      if git checkout -b "$local_branch" --track "$branch_name"; then
+        switch_success=true
+      fi
     fi
   fi
 
-  if [[ $? -eq 0 ]]; then
-    print_success "Successfully switched to branch: $(git rev-parse --abbrev-ref HEAD)"
+  if [[ "$switch_success" == true ]]; then
+    print_success "Switched to branch: $(git rev-parse --abbrev-ref HEAD)"
+    
+    # -----------------------------
+    # 6. Check if branch is behind upstream and offer to pull
+    # -----------------------------
+    local upstream behind_count
+    upstream=$(git rev-parse --abbrev-ref '@{upstream}' 2>/dev/null || true)
+    
+    if [[ -n "$upstream" ]]; then
+      # Fetch to get latest info (silently)
+      git fetch origin 2>/dev/null || true
+      
+      # Check how many commits we're behind
+      behind_count=$(git rev-list --count HEAD..@{upstream} 2>/dev/null || echo "0")
+      
+      if [[ "$behind_count" -gt 0 ]]; then
+        print_warning "Branch is $behind_count commit(s) behind '$upstream'"
+        local pull_answer
+        prompt_read "Pull latest changes? (Y/n): " pull_answer
+        case "$pull_answer" in
+          [nN][oO]|[nN])
+            print_info "Skipped pulling. Run 'git pull' when ready."
+            ;;
+          *)
+            if git pull; then
+              print_success "Successfully pulled latest changes."
+            else
+              print_error "Pull failed. You may need to resolve conflicts."
+              return 1
+            fi
+            ;;
+        esac
+      fi
+    fi
   else
     print_error "Failed to switch branch."
     return 1

package/commands/unstash.sh

@@ -129,7 +129,7 @@ EOF
     # 4. Extract stash ID safely
     # -----------------------------
     local stash_id
-    stash_id=$(echo "$selection" | grep -o 'stash@{[0-9]\+}')
+    stash_id=$(echo "$selection" | grep -o 'stash@{[0-9]\+}' || true)
 
     if [[ -z "$stash_id" ]]; then
         echo "Error: Could not determine stash ID."

package/package.json

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