gitbash 2.0.0 → 2.1.0

package/commands/_utils.sh

@@ -20,6 +20,21 @@ _gb_color_ok() {
     [[ -z "${NO_COLOR:-}" && -t "$1" ]]
 }
 
+# NO_COLOR (https://no-color.org): a non-empty value turns off all colors.
+# GB_COLOR is the --color value for git and bat in fzf previews; it is
+# exported because previews run in a separate bash started by fzf.
+if [[ -n "${NO_COLOR:-}" ]]; then
+    GB_COLOR="never"
+    # Also for git's own output (added to any GIT_CONFIG_* entries already set)
+    _gb_n="${GIT_CONFIG_COUNT:-0}"
+    export "GIT_CONFIG_KEY_$_gb_n=color.ui" "GIT_CONFIG_VALUE_$_gb_n=never"
+    export GIT_CONFIG_COUNT=$((_gb_n + 1))
+    unset _gb_n
+else
+    GB_COLOR="always"
+fi
+export GB_COLOR
+
 _gb_print() {
     local fd="$1" color="$2" symbol="$3"
     shift 3
@@ -35,6 +50,26 @@ print_info()    { _gb_print 1 "0;34" "ℹ" "$@"; }
 print_warning() { _gb_print 2 "0;33" "⚠" "$@"; }
 print_error()   { _gb_print 2 "0;31" "✗" "$@"; }
 
+# Print help text from stdin, coloring the section headings
+# ("Options:", "See also:", ...) and the "Usage:" label.
+gb_help() {
+    if ! _gb_color_ok 1; then
+        cat
+        return 0
+    fi
+    local h=$'\033[1;38;5;209m' r=$'\033[0m' line
+    local heading='^[A-Z][A-Za-z ()]*:$'
+    while IFS= read -r line || [[ -n "$line" ]]; do
+        if [[ "$line" =~ $heading ]]; then
+            printf '%s%s%s\n' "$h" "$line" "$r"
+        elif [[ "$line" == "Usage: "* ]]; then
+            printf '%sUsage:%s%s\n' "$h" "$r" "${line#Usage:}"
+        else
+            printf '%s\n' "$line"
+        fi
+    done
+}
+
 # =============================================================================
 # Prompts
 # =============================================================================
@@ -101,7 +136,7 @@ gb_choice() {
 GB_CONFIG_KEYS="GITBASH_CREATE_BRANCH_PREFIX GITBASH_FEATURE_BRANCH_PREFIX GITBASH_MERGE_COMMAND \
 GITBASH_CREATE_NO_ISSUE_PARSING GITBASH_CREATE_ISSUE_PARSING_FALLBACK GITBASH_CREATE_AUTO_PUSH \
 GITBASH_THEME GITBASH_STALE_MONTHS GITBASH_CLEANUP_DAYS GITBASH_PROTECTED_BRANCHES \
-GITBASH_BASE_BRANCH GITBASH_REMOTE"
+GITBASH_BASE_BRANCH GITBASH_REMOTE GITBASH_NO_UPDATE_CHECKS GITBASH_RESET_KEEP"
 
 _gb_config_key_allowed() {
     [[ " $GB_CONFIG_KEYS " == *" $1 "* ]]
@@ -179,6 +214,7 @@ _gb_normalize_config() {
     GITBASH_CREATE_ISSUE_PARSING_FALLBACK="${GITBASH_CREATE_ISSUE_PARSING_FALLBACK:-NOISSUE}"
     GITBASH_PROTECTED_BRANCHES="${GITBASH_PROTECTED_BRANCHES:-main master develop release/*}"
     GITBASH_BASE_BRANCH="${GITBASH_BASE_BRANCH:-}"
+    GITBASH_RESET_KEEP="${GITBASH_RESET_KEEP:-}"
 
     case "${GITBASH_CREATE_NO_ISSUE_PARSING:-no}" in
         yes|no) GITBASH_CREATE_NO_ISSUE_PARSING="${GITBASH_CREATE_NO_ISSUE_PARSING:-no}" ;;
@@ -195,6 +231,12 @@ _gb_normalize_config() {
         *) print_warning "Invalid GITBASH_THEME '$GITBASH_THEME', using 'auto'."
            GITBASH_THEME="auto" ;;
     esac
+    case "${GITBASH_NO_UPDATE_CHECKS:-no}" in
+        yes|1|true) GITBASH_NO_UPDATE_CHECKS="yes" ;;
+        no|0|false) GITBASH_NO_UPDATE_CHECKS="no" ;;
+        *) print_warning "Invalid GITBASH_NO_UPDATE_CHECKS '$GITBASH_NO_UPDATE_CHECKS', using 'no'."
+           GITBASH_NO_UPDATE_CHECKS="no" ;;
+    esac
     if ! [[ "${GITBASH_STALE_MONTHS:-3}" =~ ^[1-9][0-9]*$ ]]; then
         print_warning "Invalid GITBASH_STALE_MONTHS '$GITBASH_STALE_MONTHS', using 3."
         GITBASH_STALE_MONTHS=3
@@ -310,6 +352,29 @@ gb_base_ref() {
     fi
 }
 
+# Fetch the current branch's upstream and, if it has new commits, offer to
+# fast-forward. Returns 1 only when the fast-forward fails.
+gb_offer_fast_forward() {
+    local branch upstream_remote upstream_merge behind
+    branch=$(gb_current_branch) || return 0
+    upstream_remote=$(git config "branch.$branch.remote" 2>/dev/null) || return 0
+    upstream_merge=$(git config "branch.$branch.merge" 2>/dev/null) || return 0
+    git fetch --quiet "$upstream_remote" "$upstream_merge" 2>/dev/null || return 0
+    behind=$(git rev-list --count "HEAD..@{upstream}" 2>/dev/null) || return 0
+    if [[ "$behind" -gt 0 ]]; then
+        print_warning "Branch is $behind commit(s) behind its upstream."
+        if gb_confirm "Fast-forward to the latest changes?" y; then
+            if git merge --ff-only --quiet "@{upstream}"; then
+                print_success "Up to date."
+            else
+                print_error "Could not fast-forward (you have local commits or changes). Run 'git pull' to reconcile."
+                return 1
+            fi
+        fi
+    fi
+    return 0
+}
+
 # Returns 0 if the branch is protected (base branch or GITBASH_PROTECTED_BRANCHES).
 # Set GB_BASE beforehand to avoid detecting the base branch on every call.
 gb_is_protected() {
@@ -454,9 +519,9 @@ gb_sync_and_push() {
 # Previews
 # =============================================================================
 
-# Command that colors a diff read from stdin (delta if installed)
+# Command that colors a diff read from stdin (delta if installed and colors are on)
 gb_diff_pager() {
-    if command -v delta >/dev/null 2>&1; then
+    if [[ "$GB_COLOR" == "always" ]] && command -v delta >/dev/null 2>&1; then
         case "${GITBASH_THEME:-auto}" in
             dark) echo "delta --dark" ;;
             light) echo "delta --light" ;;
@@ -480,9 +545,9 @@ gb_bat_cmd() {
         return 0
     fi
     case "${GITBASH_THEME:-auto}" in
-        dark) echo "$bat --color=always --style=numbers --theme=Dracula" ;;
-        light) echo "$bat --color=always --style=numbers --theme=GitHub" ;;
-        *) echo "$bat --color=always --style=numbers" ;;
+        dark) echo "$bat --color=$GB_COLOR --style=numbers --theme=Dracula" ;;
+        light) echo "$bat --color=$GB_COLOR --style=numbers --theme=GitHub" ;;
+        *) echo "$bat --color=$GB_COLOR --style=numbers" ;;
     esac
 }
 
@@ -518,6 +583,52 @@ gb_urlencode() {
     printf '%s' "$out"
 }
 
+# Convert a remote URL to the repository's web URL (credentials and .git removed).
+# Handles https://[user[:token]@]host/path, ssh://[user@]host[:port]/path and user@host:path.
+gb_web_url() {
+    local url="$1" scheme="https" rest host path
+    case "$url" in
+        http://*|https://*)
+            scheme="${url%%://*}"
+            rest="${url#*://}"
+            host="${rest%%/*}"
+            host="${host##*@}"
+            path="${rest#*/}"
+            ;;
+        ssh://*)
+            rest="${url#ssh://}"
+            host="${rest%%/*}"
+            host="${host##*@}"
+            host="${host%%:*}"
+            path="${rest#*/}"
+            ;;
+        *@*:*)
+            host="${url%%:*}"
+            host="${host##*@}"
+            path="${url#*:}"
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+    path="${path%/}"
+    path="${path%.git}"
+    if [[ -z "$host" || -z "$path" || ( -n "$rest" && "$path" == "$rest" ) ]]; then
+        return 1
+    fi
+
+    # Azure DevOps SSH: ssh.dev.azure.com:v3/org/project/repo
+    if [[ "$host" == "ssh.dev.azure.com" && "$path" == v3/*/*/* ]]; then
+        local org project repo
+        path="${path#v3/}"
+        org="${path%%/*}"; path="${path#*/}"
+        project="${path%%/*}"; repo="${path#*/}"
+        echo "https://dev.azure.com/$org/$project/_git/$repo"
+        return 0
+    fi
+    echo "$scheme://$host/$path"
+}
+
 # Open a URL in the browser, or print it if no opener is available
 gb_open_url() {
     local url="$1"

package/commands/branch.sh

@@ -14,7 +14,7 @@ branch() {
         return 0
     fi
     if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
-        cat << 'EOF'
+        gb_help << 'EOF'
 Usage: branch [OPTIONS]
 
 Interactive menu to manage git branches.
@@ -86,8 +86,8 @@ Examples:
   ✓ 'feature/PROJ-123-add-new-feature' is now up-to-date with 'main'.
 
 Actions:
-  🌿 Create  - Create a new feature branch with Jira parsing
-  🔀 Switch  - Switch to another branch using fzf
+  🌿 Create - Create a new feature branch with Jira parsing
+  🔀 Switch - Switch to another branch using fzf
   ⬆️  Update - Update current branch with latest main/master
 
 Requirements:

package/commands/cleanstash.sh

@@ -13,7 +13,7 @@ cleanstash() {
         return 0
     fi
     if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
-        cat << 'EOF'
+        gb_help << 'EOF'
 Usage: cleanstash [OPTIONS]
 
 Delete git stashes without applying them.

package/commands/cleanup.sh

@@ -37,7 +37,7 @@ cleanup() {
         return 0
         ;;
       -h|--help)
-        cat << 'EOF'
+        gb_help << 'EOF'
 Usage: cleanup [OPTIONS]
 
 Find and delete local branches that are no longer needed.
@@ -178,7 +178,7 @@ EOF
     fi
     entries+=("$preselect|$label|$ts|$branch|$rel|$email|$unpushed|$name")
   done < <(git for-each-ref \
-      --format="%(refname:short)%1f%(committerdate:unix)%1f%(committerdate:relative)%1f%(committeremail)%1f%(upstream:short)%1f%(upstream:track)%1f%(committername)" \
+      --format="%(refname:short)%1f%(committerdate:unix)%1f%(committerdate:relative)%1f%(authoremail)%1f%(upstream:short)%1f%(upstream:track)%1f%(authorname)" \
       refs/heads 2>/dev/null)
 
   # Pre-selected first, then newest first
@@ -273,14 +273,14 @@ ${#sorted[@]} branches, $preselect_count pre-selected" \
             if [[ -z "$branch" ]]; then echo "Exit without action"; exit 0; fi
             echo "Branch: $branch"
             echo
-            unpushed=$(git log --oneline --color=always "refs/heads/$branch" --not --remotes 2>/dev/null)
+            unpushed=$(git log --oneline --color=$GB_COLOR "refs/heads/$branch" --not --remotes 2>/dev/null)
             if [[ -n "$unpushed" ]]; then
                 echo "Unpushed commits (only on this machine):"
                 echo "$unpushed"
                 echo
             fi
             echo "Recent commits:"
-            git log --oneline --color=always -n 15 "refs/heads/$branch" 2>/dev/null
+            git log --oneline --color=$GB_COLOR -n 15 "refs/heads/$branch" 2>/dev/null
         ' \
         --preview-window=right:40% \
         --bind "load:$toggle_sequence" \

package/commands/commit.sh

@@ -23,7 +23,7 @@ commit() {
         return 0
         ;;
       -h|--help)
-        cat << 'EOF'
+        gb_help << 'EOF'
 Usage: commit [OPTIONS] [MESSAGE...] [-- MESSAGE...]
 
 Commit your changes with a message.

package/commands/commits.sh

@@ -5,21 +5,28 @@ SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # shellcheck source=_utils.sh
 source "$SOURCE_DIR/_utils.sh"
 
-# List recent commits and optionally revert selected ones
+# List the current branch's own commits and optionally revert selected ones
 commits() {
     if [[ "${1:-}" == "-v" || "${1:-}" == "--version" ]]; then
         echo "gitbash ${FUNCNAME[0]} v$VERSION"
         return 0
     fi
     if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
-        cat << 'EOF'
-Usage: commits [COUNT]
+        gb_help << 'EOF'
+Usage: commits [-a|--all] [COUNT]
 
-List recent commits in the current branch with option to revert selected ones.
+List the commits made on the current branch with option to revert selected ones.
+
+On a feature branch only the commits that are not in the base branch are
+shown. On the base branch its own history is shown (--first-parent), so
+merged branches appear as their merge commit.
 
 Arguments:
   COUNT         Number of commits to show (default: 20)
 
+Options:
+  -a, --all     Show all recent commits reachable from HEAD
+
 Navigation:
   ↑/↓           Navigate through commits
   TAB           Select/deselect commit for revert
@@ -27,6 +34,7 @@ Navigation:
   ESC/Ctrl-C    Exit without action
 
 Notes:
+  - If the upstream has new commits, offers to fast-forward first
   - Preview shows the full commit diff
   - Selected commits are reverted newest first, whatever order you picked them in
   - Merge commits are reverted against their first parent (the branch they were merged into)
@@ -35,6 +43,7 @@ Notes:
 Examples:
   $ commits
   $ commits 50
+  $ commits --all
 
 Requirements:
   - Must be in a git repository
@@ -46,16 +55,56 @@ EOF
 
     require_git_repo || return 1
 
-    local count="${1:-20}"
+    local all=false count=""
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            -a|--all) all=true ;;
+            -*) print_error "Unknown option '$1'. See 'commits --help'."; return 1 ;;
+            *)
+                if [[ -n "$count" ]]; then
+                    print_error "Unexpected argument '$1'. See 'commits --help'."
+                    return 1
+                fi
+                count="$1"
+                ;;
+        esac
+        shift
+    done
+    count="${count:-20}"
     if ! [[ "$count" =~ ^[1-9][0-9]*$ ]]; then
         print_error "COUNT must be a positive number (got '$count')."
         return 1
     fi
     require_fzf || return 1
 
+    # Offer to pull remote commits first, so they show up (and can be reverted)
+    gb_offer_fast_forward || true
+
     local current_branch
     current_branch=$(gb_current_branch) || current_branch="(detached HEAD)"
 
+    # -----------------------------
+    # Which commits: the branch's own (not in the base branch) or, on the
+    # base branch, its first-parent history
+    # -----------------------------
+    local log_args=() scope="last $count commits" empty_hint="" base_branch base_ref
+    if [[ "$all" == false ]] && base_branch=$(gb_base_branch 2>/dev/null); then
+        base_ref=$(gb_base_ref "$base_branch")
+        if [[ "$current_branch" == "$base_branch" ]]; then
+            log_args=(--first-parent)
+            scope="last $count commits on '$base_branch' (merged branches as merge commits)"
+        elif git rev-parse --verify --quiet "$base_ref^{commit}" >/dev/null; then
+            log_args=(--not "$base_ref")
+            # Also exclude the local base branch when it is ahead of the remote one
+            if [[ "$base_ref" != "$base_branch" ]] &&
+               git show-ref --verify --quiet "refs/heads/$base_branch"; then
+                log_args+=("$base_branch")
+            fi
+            scope="commits not in '$base_ref' (up to $count)"
+            empty_hint="No commits on '$current_branch' that are not in '$base_ref'. Use 'commits --all' to show all recent commits."
+        fi
+    fi
+
     # -----------------------------
     # Build commit list (fields separated by \x1f, subject last)
     # -----------------------------
@@ -67,10 +116,10 @@ EOF
         fi
         commit_list+=$(printf "%-10s  %-60s  %-15s  %s" "$hash" "$subject" "$date" "$author")
         commit_list+=$'\t'"$hash"$'\n'
-    done < <(git log -n "$count" --format='%h%x1f%cr%x1f%an%x1f%s' 2>/dev/null)
+    done < <(git log -n "$count" --format='%h%x1f%cr%x1f%an%x1f%s' HEAD ${log_args[@]+"${log_args[@]}"} 2>/dev/null)
 
     if [[ -z "$commit_list" ]]; then
-        echo "No commits found."
+        echo "${empty_hint:-No commits found.}"
         return 0
     fi
 
@@ -78,11 +127,11 @@ EOF
     pager=$(gb_diff_pager)
     preview='
         hash=$(printf "%s" {} | cut -f2)
-        git show --stat --color=always "$hash" 2>/dev/null
+        git show --stat --color=$GB_COLOR "$hash" 2>/dev/null
         echo
         echo "─────────────────────────────────────────────────────"
         echo
-        git show --color=always --format= "$hash" 2>/dev/null | head -300 | __PAGER__'
+        git show --color=$GB_COLOR --format= "$hash" 2>/dev/null | head -300 | __PAGER__'
     preview="${preview//__PAGER__/$pager}"
 
     local selection
@@ -92,7 +141,7 @@ EOF
         --reverse \
         --border \
         --header="[TAB] select for revert | [Enter] revert selected | [ESC] exit
-Showing last $count commits" \
+Showing $scope" \
         --multi \
         --delimiter=$'\t' \
         --with-nth=1 \

package/commands/create.sh

@@ -51,7 +51,7 @@ create() {
         return 0
         ;;
       -h|--help)
-        cat << 'EOF'
+        gb_help << 'EOF'
 Usage: create [OPTIONS] [JIRA_LINK] [TITLE...]
 
 Create a new git branch from the latest base branch, with optional Jira issue parsing.

package/commands/pr.sh

@@ -5,52 +5,6 @@ SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # shellcheck source=_utils.sh
 source "$SOURCE_DIR/_utils.sh"
 
-# Convert a remote URL to the repository's web URL (credentials and .git removed).
-# Handles https://[user[:token]@]host/path, ssh://[user@]host[:port]/path and user@host:path.
-_pr_web_base() {
-  local url="$1" scheme="https" rest host path
-  case "$url" in
-    http://*|https://*)
-      scheme="${url%%://*}"
-      rest="${url#*://}"
-      host="${rest%%/*}"
-      host="${host##*@}"
-      path="${rest#*/}"
-      ;;
-    ssh://*)
-      rest="${url#ssh://}"
-      host="${rest%%/*}"
-      host="${host##*@}"
-      host="${host%%:*}"
-      path="${rest#*/}"
-      ;;
-    *@*:*)
-      host="${url%%:*}"
-      host="${host##*@}"
-      path="${url#*:}"
-      ;;
-    *)
-      return 1
-      ;;
-  esac
-  path="${path%/}"
-  path="${path%.git}"
-  if [[ -z "$host" || -z "$path" || ( -n "$rest" && "$path" == "$rest" ) ]]; then
-    return 1
-  fi
-
-  # Azure DevOps SSH: ssh.dev.azure.com:v3/org/project/repo
-  if [[ "$host" == "ssh.dev.azure.com" && "$path" == v3/*/*/* ]]; then
-    local org project repo
-    path="${path#v3/}"
-    org="${path%%/*}"; path="${path#*/}"
-    project="${path%%/*}"; repo="${path#*/}"
-    echo "https://dev.azure.com/$org/$project/_git/$repo"
-    return 0
-  fi
-  echo "$scheme://$host/$path"
-}
-
 # Web URL for creating a pull/merge request for a branch
 _pr_create_url() {
   local base="$1" branch="$2" encoded
@@ -83,7 +37,7 @@ pr() {
         return 0
         ;;
       -h|--help)
-        cat << 'EOF'
+        gb_help << 'EOF'
 Usage: pr [OPTIONS]
 
 Open the current branch's pull request in your browser.
@@ -147,7 +101,7 @@ EOF
     print_error "Detached HEAD: check out a branch first."
     return 1
   fi
-  if ! base=$(_pr_web_base "$remote_url"); then
+  if ! base=$(gb_web_url "$remote_url"); then
     print_error "Don't know how to open '$remote_url' in a browser."
     return 1
   fi

package/commands/repo.sh

@@ -0,0 +1,82 @@
+#!/usr/bin/env bash
+
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
+# Open the repository's web page
+repo() {
+  local print_only=false
+
+  while [[ $# -gt 0 ]]; do
+    case "$1" in
+      -v|--version)
+        echo "gitbash ${FUNCNAME[0]} v$VERSION"
+        return 0
+        ;;
+      -h|--help)
+        gb_help << 'EOF_HELP'
+Usage: repo [OPTIONS]
+
+Open the repository's web page in your browser.
+
+Options:
+  --print       Print the URL instead of opening it
+  -h, --help    Show this help message
+
+Behavior:
+  - Uses the URL of the configured remote (GITBASH_REMOTE, default: origin)
+  - With the GitHub CLI (gh) installed and logged in, opens it with 'gh repo view --web'
+  - Otherwise opens the URL derived from the remote
+    (GitHub, GitHub Enterprise, GitLab, Bitbucket, Azure DevOps)
+  - Works with SSH and HTTPS remotes; credentials in the remote URL are never used
+  - Opens the browser with 'open' (macOS) or 'xdg-open' (Linux), otherwise prints the URL
+
+Examples:
+  $ repo
+  $ repo --print
+
+EOF_HELP
+        return 0
+        ;;
+      --print)
+        print_only=true
+        shift
+        ;;
+      *)
+        print_error "Unknown argument: $1"
+        echo "Usage: repo [--print]" >&2
+        return 1
+        ;;
+    esac
+  done
+
+  require_git_repo || return 1
+
+  local remote remote_url url
+  remote=$(gb_remote)
+  if ! remote_url=$(git config --get "remote.$remote.url"); then
+    print_error "No remote '$remote' found."
+    return 1
+  fi
+  if ! url=$(gb_web_url "$remote_url"); then
+    print_error "Don't know how to open '$remote_url' in a browser."
+    return 1
+  fi
+
+  if [[ "$print_only" == true ]]; then
+    echo "$url"
+    return 0
+  fi
+
+  if [[ "$url" != *gitlab* && "$url" != *bitbucket.org/* && "$url" != *dev.azure.com/* && "$url" != *visualstudio.com/* ]] &&
+     command -v gh >/dev/null 2>&1; then
+    if GH_PROMPT_DISABLED=1 gh repo view "$url" --web >/dev/null 2>&1; then
+      print_success "Opened $url"
+      return 0
+    fi
+  fi
+
+  gb_open_url "$url"
+}