gitbash 1.6.7 → 1.8.0

package/README.md

@@ -15,10 +15,12 @@ npm i -g gitbash && gitbash --config
 ### Options
 
 ```bash
-gitbash --help      # Show help
-gitbash --version   # Show version
-gitbash --init      # Print shell init code
-gitbash --config    # Interactive configuration wizard
+gitbash --help         # Show help
+gitbash --version      # Show version
+gitbash --init         # Print shell init code
+gitbash --config       # Interactive configuration wizard
+gitbash --config-local # Configure local overrides for current repository
+gitbash --config-user  # Configure user-specific overrides (excluded from git)
 ```
 
 ### Dependencies
@@ -241,6 +243,30 @@ GITBASH_CLEANUP_DAYS=7
 
 You can create this file manually or use `gitbash --config` to configure interactively.
 
+#### Local Configuration
+
+gitbash also supports repository-specific configuration overrides. Run `gitbash --config-local` inside a git repository to create a `.gitbashrc` file in the repository root.
+
+Local settings override the global `~/.gitbashrc` for that repository only. This is useful for:
+
+- Different branch prefixes per project (e.g., team names)
+- Project-specific issue parsing settings
+- Different stale/cleanup thresholds per repository
+
+The interactive wizard will show each setting's current global value and ask if you want to override it locally. Only overridden values are written to the local config.
+
+#### User Configuration
+
+For personal settings that should not be committed to version control, run `gitbash --config-user` to create a `.gitbashrc-user` file in the repository root.
+
+User settings override both global (`~/.gitbashrc`) and local (`.gitbashrc`) settings. The file is automatically added to `.gitignore`.
+
+**Configuration priority (highest to lowest):**
+
+1. `.gitbashrc-user` - User-specific settings (not committed)
+2. `.gitbashrc` - Repository settings (can be committed)
+3. `~/.gitbashrc` - Global settings
+
 ### Individual aliases
 
 Instead of adding every command via `eval "$(gitbash --init)"` in `.zshrc` or `.bashrc`

package/bin/gitbash

@@ -4,12 +4,32 @@
 set -euo pipefail
 
 CONFIG_FILE="$HOME/.gitbashrc"
+LOCAL_CONFIG_FILE=".gitbashrc"
+USER_CONFIG_FILE=".gitbashrc-user"
 
 load_config() {
+    # Source global config first
     if [[ -f "$CONFIG_FILE" ]]; then
         # shellcheck disable=SC1090
         source "$CONFIG_FILE"
     fi
+    
+    # Source local config from repo root if present (overrides global)
+    local repo_root
+    if repo_root=$(git rev-parse --show-toplevel 2>/dev/null); then
+        local local_config="$repo_root/$LOCAL_CONFIG_FILE"
+        if [[ -f "$local_config" ]]; then
+            # shellcheck disable=SC1090
+            source "$local_config"
+        fi
+        
+        # Source user config from repo root if present (overrides both)
+        local user_config="$repo_root/$USER_CONFIG_FILE"
+        if [[ -f "$user_config" ]]; then
+            # shellcheck disable=SC1090
+            source "$user_config"
+        fi
+    fi
 }
 
 configure_gitbash() {
@@ -48,7 +68,7 @@ configure_gitbash() {
     if [[ -n "$current_prefix" ]]; then
         echo "Tip: Enter a single dash '-' to explicitly clear the prefix"
     fi
-    read -e -p "Branch prefix [${current_prefix}]: " prefix
+    read -re -p "Branch prefix [${current_prefix}]: " prefix
     # If user just pressed Enter, keep current value
     # If user entered a single dash, clear it
     if [[ -z "$prefix" ]]; then
@@ -61,7 +81,7 @@ configure_gitbash() {
 
     # Merge tool
     echo
-    read -e -p "Merge tool command (used by update on conflicts) [${current_merge}]: " input
+    read -re -p "Merge tool command (used by update on conflicts) [${current_merge}]: " input
     merge_cmd=${input:-$current_merge}
 
     # Issue parsing
@@ -72,7 +92,7 @@ configure_gitbash() {
         current_enabled="no"
     fi
     
-    read -e -p "Enable Jira issue parsing in branch names? (yes/no) [${current_enabled}]: " input
+    read -re -p "Enable Jira issue parsing in branch names? (yes/no) [${current_enabled}]: " input
     local enable_parsing=${input:-$current_enabled}
     
     # Convert answer to no_issue_parsing variable (inverted logic)
@@ -91,7 +111,7 @@ configure_gitbash() {
 
     # Issue parsing fallback (only ask if parsing is enabled)
     if [[ "$enable_parsing" == "yes" ]]; then
-        read -e -p "Fallback prefix when no issue number is provided [${current_issue_fallback}]: " input
+        read -re -p "Fallback prefix when no issue number is provided [${current_issue_fallback}]: " input
         issue_fallback=${input:-$current_issue_fallback}
     else
         issue_fallback="${current_issue_fallback}"
@@ -103,7 +123,7 @@ configure_gitbash() {
     echo "  auto  - Use terminal's theme detection"
     echo "  dark  - Force dark theme"
     echo "  light - Force light theme (GitHub style)"
-    read -e -p "Theme [${current_theme}]: " input
+    read -re -p "Theme [${current_theme}]: " input
     theme=${input:-$current_theme}
     case "$theme" in
         auto|dark|light) ;;
@@ -115,7 +135,7 @@ configure_gitbash() {
 
     # Stale branch threshold
     echo
-    read -e -p "Stale branch threshold in months (used by stale) [${current_stale_months}]: " input
+    read -re -p "Stale branch threshold in months (used by stale) [${current_stale_months}]: " input
     stale_months=${input:-$current_stale_months}
     if ! [[ "$stale_months" =~ ^[0-9]+$ ]] || [[ "$stale_months" -lt 1 ]]; then
         echo "Invalid value. Using default of 3 months."
@@ -123,7 +143,7 @@ configure_gitbash() {
     fi
 
     # Cleanup threshold
-    read -e -p "Cleanup threshold in days (used by cleanup) [${current_cleanup_days}]: " input
+    read -re -p "Cleanup threshold in days (used by cleanup) [${current_cleanup_days}]: " input
     cleanup_days=${input:-$current_cleanup_days}
     if ! [[ "$cleanup_days" =~ ^[0-9]+$ ]] || [[ "$cleanup_days" -lt 1 ]]; then
         echo "Invalid value. Using default of 7 days."
@@ -171,6 +191,374 @@ EOF
     check_shell_integration
 }
 
+configure_local_gitbash() {
+    # Check if we're in a git repository
+    local repo_root
+    if ! repo_root=$(git rev-parse --show-toplevel 2>/dev/null); then
+        echo "Error: Not inside a git repository." >&2
+        exit 1
+    fi
+    
+    local local_config="$repo_root/$LOCAL_CONFIG_FILE"
+    
+    # Load global config first to get current defaults
+    load_config
+    
+    # Backward compatibility: migrate GITBASH_FEATURE_BRANCH_PREFIX to GITBASH_CREATE_BRANCH_PREFIX
+    local current_prefix="${GITBASH_CREATE_BRANCH_PREFIX:-}"
+    if [[ -z "$current_prefix" && -n "${GITBASH_FEATURE_BRANCH_PREFIX:-}" ]]; then
+        # Remove "feature/" prefix from old variable
+        current_prefix="${GITBASH_FEATURE_BRANCH_PREFIX#feature/}"
+    fi
+    # Remove trailing slash if present
+    current_prefix="${current_prefix%/}"
+    
+    echo "Configure local gitbash overrides for this repository"
+    echo "Config will be saved to: $local_config"
+    echo
+    echo "Press Enter to keep global setting, or enter a new value to override."
+    echo "Enter '-' to explicitly unset a local override."
+    echo
+
+    local overrides=()
+    local input
+    
+    # Branch prefix (current_prefix already set above with backward compatibility)
+    echo "1. Branch prefix"
+    echo "   Current (global): ${current_prefix:-'(empty)'}"
+    read -re -p "   Local override: " input
+    if [[ -n "$input" ]]; then
+        if [[ "$input" == "-" ]]; then
+            overrides+=("GITBASH_CREATE_BRANCH_PREFIX=\"\"")
+            echo "   → Will use empty prefix locally"
+        else
+            input="${input%/}"  # Remove trailing slash
+            overrides+=("GITBASH_CREATE_BRANCH_PREFIX=\"$input\"")
+            echo "   → Will use '$input' locally"
+        fi
+    else
+        echo "   → Keeping global setting"
+    fi
+    echo
+
+    # Merge command
+    local current_merge="${GITBASH_MERGE_COMMAND:-fork}"
+    echo "2. Merge tool command (used by update on conflicts)"
+    echo "   Current (global): $current_merge"
+    read -re -p "   Local override: " input
+    if [[ -n "$input" && "$input" != "-" ]]; then
+        overrides+=("GITBASH_MERGE_COMMAND=\"$input\"")
+        echo "   → Will use '$input' locally"
+    else
+        echo "   → Keeping global setting"
+    fi
+    echo
+
+    # Issue parsing
+    local current_no_issue_parsing="${GITBASH_CREATE_NO_ISSUE_PARSING:-no}"
+    local current_enabled="yes"
+    [[ "$current_no_issue_parsing" == "yes" ]] && current_enabled="no"
+    echo "3. Enable Jira issue parsing in branch names? (yes/no)"
+    echo "   Current (global): $current_enabled"
+    read -re -p "   Local override: " input
+    if [[ -n "$input" && "$input" != "-" ]]; then
+        case "$input" in
+            yes)
+                overrides+=("GITBASH_CREATE_NO_ISSUE_PARSING=\"no\"")
+                echo "   → Will enable parsing locally"
+                ;;
+            no)
+                overrides+=("GITBASH_CREATE_NO_ISSUE_PARSING=\"yes\"")
+                echo "   → Will disable parsing locally"
+                ;;
+            *)
+                echo "   → Invalid value, keeping global setting"
+                ;;
+        esac
+    else
+        echo "   → Keeping global setting"
+    fi
+    echo
+
+    # Issue fallback
+    local current_issue_fallback="${GITBASH_CREATE_ISSUE_PARSING_FALLBACK:-NOISSUE}"
+    echo "4. Fallback prefix when no issue number is provided"
+    echo "   Current (global): $current_issue_fallback"
+    read -re -p "   Local override: " input
+    if [[ -n "$input" && "$input" != "-" ]]; then
+        overrides+=("GITBASH_CREATE_ISSUE_PARSING_FALLBACK=\"$input\"")
+        echo "   → Will use '$input' locally"
+    else
+        echo "   → Keeping global setting"
+    fi
+    echo
+
+    # Theme
+    local current_theme="${GITBASH_THEME:-auto}"
+    echo "5. Theme for delta/bat (auto/dark/light)"
+    echo "   Current (global): $current_theme"
+    read -re -p "   Local override: " input
+    if [[ -n "$input" && "$input" != "-" ]]; then
+        case "$input" in
+            auto|dark|light)
+                overrides+=("GITBASH_THEME=\"$input\"")
+                echo "   → Will use '$input' locally"
+                ;;
+            *)
+                echo "   → Invalid value, keeping global setting"
+                ;;
+        esac
+    else
+        echo "   → Keeping global setting"
+    fi
+    echo
+
+    # Stale months
+    local current_stale_months="${GITBASH_STALE_MONTHS:-3}"
+    echo "6. Stale branch threshold in months"
+    echo "   Current (global): $current_stale_months"
+    read -re -p "   Local override: " input
+    if [[ -n "$input" && "$input" != "-" ]]; then
+        if [[ "$input" =~ ^[0-9]+$ ]] && [[ "$input" -ge 1 ]]; then
+            overrides+=("GITBASH_STALE_MONTHS=\"$input\"")
+            echo "   → Will use '$input' locally"
+        else
+            echo "   → Invalid value, keeping global setting"
+        fi
+    else
+        echo "   → Keeping global setting"
+    fi
+    echo
+
+    # Cleanup days
+    local current_cleanup_days="${GITBASH_CLEANUP_DAYS:-7}"
+    echo "7. Cleanup threshold in days"
+    echo "   Current (global): $current_cleanup_days"
+    read -re -p "   Local override: " input
+    if [[ -n "$input" && "$input" != "-" ]]; then
+        if [[ "$input" =~ ^[0-9]+$ ]] && [[ "$input" -ge 1 ]]; then
+            overrides+=("GITBASH_CLEANUP_DAYS=\"$input\"")
+            echo "   → Will use '$input' locally"
+        else
+            echo "   → Invalid value, keeping global setting"
+        fi
+    else
+        echo "   → Keeping global setting"
+    fi
+    echo
+
+    # Check if any overrides were set
+    if [[ ${#overrides[@]} -eq 0 ]]; then
+        echo "No local overrides configured."
+        return 0
+    fi
+
+    # Write local config file
+    {
+        echo "# Local gitbash configuration overrides for this repository"
+        echo "# Generated by 'gitbash --config-local'"
+        echo "# These settings override the global ~/.gitbashrc"
+        echo
+        for override in "${overrides[@]}"; do
+            echo "$override"
+        done
+    } > "$local_config"
+
+    echo "Saved local configuration to $local_config"
+}
+
+configure_user_gitbash() {
+    # Check if we're in a git repository
+    local repo_root
+    if ! repo_root=$(git rev-parse --show-toplevel 2>/dev/null); then
+        echo "Error: Not inside a git repository." >&2
+        exit 1
+    fi
+    
+    local user_config="$repo_root/$USER_CONFIG_FILE"
+    local gitignore="$repo_root/.gitignore"
+    
+    # Load all configs to get current effective values
+    load_config
+    
+    # Backward compatibility: migrate GITBASH_FEATURE_BRANCH_PREFIX to GITBASH_CREATE_BRANCH_PREFIX
+    local current_prefix="${GITBASH_CREATE_BRANCH_PREFIX:-}"
+    if [[ -z "$current_prefix" && -n "${GITBASH_FEATURE_BRANCH_PREFIX:-}" ]]; then
+        # Remove "feature/" prefix from old variable
+        current_prefix="${GITBASH_FEATURE_BRANCH_PREFIX#feature/}"
+    fi
+    # Remove trailing slash if present
+    current_prefix="${current_prefix%/}"
+    
+    echo "Configure user-specific gitbash overrides for this repository"
+    echo "Config will be saved to: $user_config"
+    echo "This file is intended for personal settings and excluded from version control."
+    echo
+    echo "Press Enter to keep current setting, or enter a new value to override."
+    echo "Enter '-' to explicitly unset an override."
+    echo
+
+    local overrides=()
+    local input
+    
+    # Branch prefix
+    echo "1. Branch prefix"
+    echo "   Current (effective): ${current_prefix:-'(empty)'}"
+    read -re -p "   User override: " input
+    if [[ -n "$input" ]]; then
+        if [[ "$input" == "-" ]]; then
+            overrides+=("GITBASH_CREATE_BRANCH_PREFIX=\"\"")
+            echo "   → Will use empty prefix"
+        else
+            input="${input%/}"  # Remove trailing slash
+            overrides+=("GITBASH_CREATE_BRANCH_PREFIX=\"$input\"")
+            echo "   → Will use '$input'"
+        fi
+    else
+        echo "   → Keeping current setting"
+    fi
+    echo
+
+    # Merge command
+    local current_merge="${GITBASH_MERGE_COMMAND:-fork}"
+    echo "2. Merge tool command (used by update on conflicts)"
+    echo "   Current (effective): $current_merge"
+    read -re -p "   User override: " input
+    if [[ -n "$input" && "$input" != "-" ]]; then
+        overrides+=("GITBASH_MERGE_COMMAND=\"$input\"")
+        echo "   → Will use '$input'"
+    else
+        echo "   → Keeping current setting"
+    fi
+    echo
+
+    # Issue parsing
+    local current_no_issue_parsing="${GITBASH_CREATE_NO_ISSUE_PARSING:-no}"
+    local current_enabled="yes"
+    [[ "$current_no_issue_parsing" == "yes" ]] && current_enabled="no"
+    echo "3. Enable Jira issue parsing in branch names? (yes/no)"
+    echo "   Current (effective): $current_enabled"
+    read -re -p "   User override: " input
+    if [[ -n "$input" && "$input" != "-" ]]; then
+        case "$input" in
+            yes)
+                overrides+=("GITBASH_CREATE_NO_ISSUE_PARSING=\"no\"")
+                echo "   → Will enable parsing"
+                ;;
+            no)
+                overrides+=("GITBASH_CREATE_NO_ISSUE_PARSING=\"yes\"")
+                echo "   → Will disable parsing"
+                ;;
+            *)
+                echo "   → Invalid value, keeping current setting"
+                ;;
+        esac
+    else
+        echo "   → Keeping current setting"
+    fi
+    echo
+
+    # Issue fallback
+    local current_issue_fallback="${GITBASH_CREATE_ISSUE_PARSING_FALLBACK:-NOISSUE}"
+    echo "4. Fallback prefix when no issue number is provided"
+    echo "   Current (effective): $current_issue_fallback"
+    read -re -p "   User override: " input
+    if [[ -n "$input" && "$input" != "-" ]]; then
+        overrides+=("GITBASH_CREATE_ISSUE_PARSING_FALLBACK=\"$input\"")
+        echo "   → Will use '$input'"
+    else
+        echo "   → Keeping current setting"
+    fi
+    echo
+
+    # Theme
+    local current_theme="${GITBASH_THEME:-auto}"
+    echo "5. Theme for delta/bat (auto/dark/light)"
+    echo "   Current (effective): $current_theme"
+    read -re -p "   User override: " input
+    if [[ -n "$input" && "$input" != "-" ]]; then
+        case "$input" in
+            auto|dark|light)
+                overrides+=("GITBASH_THEME=\"$input\"")
+                echo "   → Will use '$input'"
+                ;;
+            *)
+                echo "   → Invalid value, keeping current setting"
+                ;;
+        esac
+    else
+        echo "   → Keeping current setting"
+    fi
+    echo
+
+    # Stale months
+    local current_stale_months="${GITBASH_STALE_MONTHS:-3}"
+    echo "6. Stale branch threshold in months"
+    echo "   Current (effective): $current_stale_months"
+    read -re -p "   User override: " input
+    if [[ -n "$input" && "$input" != "-" ]]; then
+        if [[ "$input" =~ ^[0-9]+$ ]] && [[ "$input" -ge 1 ]]; then
+            overrides+=("GITBASH_STALE_MONTHS=\"$input\"")
+            echo "   → Will use '$input'"
+        else
+            echo "   → Invalid value, keeping current setting"
+        fi
+    else
+        echo "   → Keeping current setting"
+    fi
+    echo
+
+    # Cleanup days
+    local current_cleanup_days="${GITBASH_CLEANUP_DAYS:-7}"
+    echo "7. Cleanup threshold in days"
+    echo "   Current (effective): $current_cleanup_days"
+    read -re -p "   User override: " input
+    if [[ -n "$input" && "$input" != "-" ]]; then
+        if [[ "$input" =~ ^[0-9]+$ ]] && [[ "$input" -ge 1 ]]; then
+            overrides+=("GITBASH_CLEANUP_DAYS=\"$input\"")
+            echo "   → Will use '$input'"
+        else
+            echo "   → Invalid value, keeping current setting"
+        fi
+    else
+        echo "   → Keeping current setting"
+    fi
+    echo
+
+    # Check if any overrides were set
+    if [[ ${#overrides[@]} -eq 0 ]]; then
+        echo "No user overrides configured."
+        return 0
+    fi
+
+    # Write user config file
+    {
+        echo "# User-specific gitbash configuration overrides for this repository"
+        echo "# Generated by 'gitbash --config-user'"
+        echo "# These settings override both global (~/.gitbashrc) and local (.gitbashrc) settings"
+        echo "# This file should NOT be committed to version control"
+        echo
+        for override in "${overrides[@]}"; do
+            echo "$override"
+        done
+    } > "$user_config"
+
+    echo "Saved user configuration to $user_config"
+    
+    # Add to .gitignore if not already present
+    if [[ -f "$gitignore" ]]; then
+        if ! grep -qxF "$USER_CONFIG_FILE" "$gitignore"; then
+            echo "$USER_CONFIG_FILE" >> "$gitignore"
+            echo "Added '$USER_CONFIG_FILE' to .gitignore"
+        else
+            echo "'$USER_CONFIG_FILE' already in .gitignore"
+        fi
+    else
+        echo "$USER_CONFIG_FILE" > "$gitignore"
+        echo "Created .gitignore with '$USER_CONFIG_FILE'"
+    fi
+}
+
 # Check and offer to install dependencies
 check_dependencies() {
     local missing_required=()
@@ -241,7 +629,7 @@ check_dependencies() {
     # Offer to install missing dependencies
     echo
     local install_deps
-    read -e -p "Install missing dependencies with Homebrew? (Y/n): " install_deps
+    read -re -p "Install missing dependencies with Homebrew? (Y/n): " install_deps
     case "$install_deps" in
         [nN][oO]|[nN])
             echo "Skipped dependency installation."
@@ -296,7 +684,7 @@ check_shell_integration() {
         echo
         echo "Shell integration not found in $shell_rc"
         local add_init
-        read -e -p "Add 'eval \"\$(gitbash --init)\"' to $shell_rc? (Y/n): " add_init
+        read -re -p "Add 'eval \"\$(gitbash --init)\"' to $shell_rc? (Y/n): " add_init
         case "$add_init" in
             [nN][oO]|[nN])
                 echo "Skipped shell integration."
@@ -358,6 +746,8 @@ Usage:
     gitbash --help
     gitbash --init
     gitbash --config
+    gitbash --config-local
+    gitbash --config-user
 
 Commands:
   branch      Interactive menu for branch operations
@@ -376,10 +766,12 @@ Commands:
   update      Merge latest main/master into current branch
 
 Options:
-  -h, --help     Show this help message
-  -v, --version  Show version number
-  --init         Print shell initialization code (for sourcing)
-    --config       Configure gitbash and save to ~/.gitbashrc
+  -h, --help       Show this help message
+  -v, --version    Show version number
+  --init           Print shell initialization code (for sourcing)
+  --config         Configure gitbash and save to ~/.gitbashrc
+  --config-local   Configure local overrides for current repository
+  --config-user    Configure user-specific overrides (excluded from git)
 
 Examples:
   gitbash commit fix bug -p     # Commit and push
@@ -438,6 +830,14 @@ main() {
             configure_gitbash
             exit 0
             ;;
+        --config-local)
+            configure_local_gitbash
+            exit 0
+            ;;
+        --config-user)
+            configure_user_gitbash
+            exit 0
+            ;;
         *)
             local cmd="$1"
             shift

package/commands/_utils.sh

@@ -2,13 +2,31 @@
 # shellcheck disable=SC2155
 # Common utilities for gitbash commands - compatible with bash and zsh
 
-# Load config file if it exists
+# Load config files if they exist
+# Global config first, then local repo config, then user config (which can override)
 CONFIG_FILE="$HOME/.gitbashrc"
+LOCAL_CONFIG_FILE=".gitbashrc"
+USER_CONFIG_FILE=".gitbashrc-user"
+
 if [[ -f "$CONFIG_FILE" ]]; then
     # shellcheck disable=SC1090
     source "$CONFIG_FILE"
 fi
 
+# Source local config from repo root if present (overrides global)
+_repo_root=$(git rev-parse --show-toplevel 2>/dev/null)
+if [[ -n "$_repo_root" && -f "$_repo_root/$LOCAL_CONFIG_FILE" ]]; then
+    # shellcheck disable=SC1090
+    source "$_repo_root/$LOCAL_CONFIG_FILE"
+fi
+
+# Source user config from repo root if present (overrides both)
+if [[ -n "$_repo_root" && -f "$_repo_root/$USER_CONFIG_FILE" ]]; then
+    # shellcheck disable=SC1090
+    source "$_repo_root/$USER_CONFIG_FILE"
+fi
+unset _repo_root
+
 # Color codes for consistent output
 COLOR_RED='\033[0;31m'
 COLOR_GREEN='\033[0;32m'

package/commands/pr.sh

@@ -1,4 +1,5 @@
 ## pr opens the current pr, if in repo
+# shellcheck shell=bash
 pr() {
   local should_push=false
 
@@ -87,6 +88,7 @@ EOF
       source "$SOURCE_DIR/_utils.sh"
     fi
     
+    local commit_answer
     prompt_read "Would you like to commit them first? (Y/n): " commit_answer
     case "$commit_answer" in
       [nN][oO]|[nN])
@@ -94,24 +96,33 @@ EOF
         ;;
       *)
         # Run status command for interactive staging and committing
-        gitbash status
-        if [[ $? -ne 0 ]]; then
+        local local_before
+        local local_after
+        local_before=$(git rev-parse --verify HEAD 2>/dev/null || true)
+        if ! gitbash status; 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
+        local_after=$(git rev-parse --verify HEAD 2>/dev/null || true)
+
+        # Only offer to push if a new commit was actually created
+        if [[ "$local_after" != "$local_before" ]]; then
+          # If -p wasn't specified, offer to push the fresh commit
+          if [[ "$should_push" != true ]]; then
+            local push_answer
+            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
+        else
+          echo "No new commit was created. Continuing without pushing..."
         fi
         ;;
     esac
@@ -138,15 +149,16 @@ EOF
   if [[ "$should_push" == true ]]; then
     # Check if remote has updates and pull first
     git fetch origin "$branch" 2>/dev/null
-    local local_commit=$(git rev-parse HEAD)
-    local remote_commit=$(git rev-parse "origin/$branch" 2>/dev/null)
+    local local_commit
+    local remote_commit
+    local_commit=$(git rev-parse HEAD)
+    remote_commit=$(git rev-parse "origin/$branch" 2>/dev/null)
     
     if [[ -n "$remote_commit" && "$local_commit" != "$remote_commit" ]]; then
       # Check if we're behind the remote
       if git merge-base --is-ancestor "$local_commit" "$remote_commit" 2>/dev/null; then
         echo "Remote has updates. Pulling first..."
-        git pull --rebase origin "$branch"
-        if [[ $? -ne 0 ]]; then
+        if ! git pull --rebase origin "$branch"; then
           echo "⚠ Failed to pull remote changes. Please resolve conflicts and try again."
           return 1
         fi
@@ -155,7 +167,7 @@ EOF
         # Branches have diverged
         echo "Remote has diverged. Pulling with rebase..."
         git pull --rebase origin "$branch"
-        if [[ $? -ne 0 ]]; then
+        if ! git pull --rebase origin "$branch"; then
           echo "⚠ Failed to pull remote changes. Please resolve conflicts and try again."
           return 1
         fi
@@ -164,8 +176,7 @@ EOF
     fi
     
     echo "Pushing '$branch' to origin..."
-    git push origin "$branch"
-    if [[ $? -eq 0 ]]; then
+    if git push origin "$branch"; then
       echo "✓ Successfully pushed '$branch' to origin."
     else
       echo "⚠ Failed to push '$branch' to origin."

package/package.json

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