gitbash 2.0.1 → 2.2.0

package/commands/_self_update.sh

@@ -0,0 +1,323 @@
+#!/usr/bin/env bash
+# Self-update for gitbash: 'gitbash --update' and the background update check.
+# Sourced by bin/gitbash; needs SCRIPT_DIR, GITBASH_BIN and VERSION.
+
+GB_REPO="jaggli/gitbash"
+GB_UPDATE_CHECK_INTERVAL=86400   # look for a new version at most once a day
+GB_UPDATE_PROMPT_INTERVAL=172800 # ask about it at most every other day
+
+# GITBASH_NO_UPDATE_CHECKS from the environment wins over the config files
+_GB_ENV_NO_UPDATE_CHECKS="${GITBASH_NO_UPDATE_CHECKS:-}"
+
+# =============================================================================
+# Install method
+# =============================================================================
+
+# Directory of a global package manager install of gitbash, symlinks resolved
+_gb_global_package_dir() {
+    local root
+    root=$("$1" root -g 2>/dev/null) || return 1
+    [[ -n "$root" ]] || return 1
+    # Windows: C:\Users\...\npm\node_modules
+    if gb_is_windows && command -v cygpath >/dev/null 2>&1; then
+        root=$(cygpath -u "$root") || return 1
+    fi
+    (cd -P "$root/gitbash" 2>/dev/null && pwd)
+}
+
+# How this copy of gitbash was installed: npm, pnpm, npx, package, script, git or unknown
+gb_install_method() {
+    case "$SCRIPT_DIR" in
+        */_npx/*)
+            echo "npx"
+            return 0
+            ;;
+        */node_modules/gitbash)
+            local pm
+            for pm in npm pnpm; do
+                if command -v "$pm" >/dev/null 2>&1 &&
+                   [[ "$(_gb_global_package_dir "$pm")" == "$SCRIPT_DIR" ]]; then
+                    echo "$pm"
+                    return 0
+                fi
+            done
+            # A dependency of some project, or a package manager we don't know
+            echo "package"
+            return 0
+            ;;
+    esac
+    if [[ -f "$SCRIPT_DIR/.gitbash-install" ]]; then
+        echo "script"
+    elif [[ -e "$SCRIPT_DIR/.git" ]]; then
+        echo "git"
+    elif [[ -f "$SCRIPT_DIR/package.json" && ! -e "$SCRIPT_DIR/README.md" ]]; then
+        # Installed by an install.sh that did not leave a marker yet
+        echo "script"
+    else
+        echo "unknown"
+    fi
+}
+
+# =============================================================================
+# State (~/.local/state/gitbash/update-check)
+# =============================================================================
+
+_gb_update_state_file() {
+    echo "${XDG_STATE_HOME:-$HOME/.local/state}/gitbash/update-check"
+}
+
+# Read the state into _GB_UC_CHECKED, _GB_UC_LATEST, _GB_UC_PROMPTED and _GB_UC_SKIPPED
+_gb_update_state_load() {
+    local file key value
+    file=$(_gb_update_state_file)
+    _GB_UC_CHECKED=0 _GB_UC_LATEST="" _GB_UC_PROMPTED=0 _GB_UC_SKIPPED=""
+    [[ -f "$file" ]] || return 0
+    while IFS='=' read -r key value; do
+        case "$key" in
+            checked) [[ "$value" =~ ^[0-9]+$ ]] && _GB_UC_CHECKED="$value" ;;
+            latest) _GB_UC_LATEST="$value" ;;
+            prompted) [[ "$value" =~ ^[0-9]+$ ]] && _GB_UC_PROMPTED="$value" ;;
+            skipped) _GB_UC_SKIPPED="$value" ;;
+        esac
+    done < "$file"
+}
+
+# Set one value, keeping the others (re-read first: a background check may have written)
+# Usage: _gb_update_state_set checked|latest|prompted|skipped <value>
+_gb_update_state_set() {
+    local file dir tmp
+    file=$(_gb_update_state_file)
+    dir=$(dirname "$file")
+    _gb_update_state_load
+    case "$1" in
+        checked) _GB_UC_CHECKED="$2" ;;
+        latest) _GB_UC_LATEST="$2" ;;
+        prompted) _GB_UC_PROMPTED="$2" ;;
+        skipped) _GB_UC_SKIPPED="$2" ;;
+    esac
+    mkdir -p "$dir" 2>/dev/null || return 1
+    tmp=$(mktemp "$dir/.update-check.XXXXXX" 2>/dev/null) || return 1
+    if ! printf 'checked=%s\nlatest=%s\nprompted=%s\nskipped=%s\n' \
+            "$_GB_UC_CHECKED" "$_GB_UC_LATEST" "$_GB_UC_PROMPTED" "$_GB_UC_SKIPPED" > "$tmp" ||
+       ! mv -f "$tmp" "$file"; then
+        rm -f "$tmp"
+        return 1
+    fi
+}
+
+_gb_now() {
+    if [[ -n "${EPOCHSECONDS:-}" ]]; then
+        echo "$EPOCHSECONDS"
+    else
+        date +%s
+    fi
+}
+
+# =============================================================================
+# Versions
+# =============================================================================
+
+# Print the contents of a URL
+_gb_fetch() {
+    if command -v curl >/dev/null 2>&1; then
+        curl -fsSL --max-time 10 "$1"
+    elif command -v wget >/dev/null 2>&1; then
+        wget -qO- -T 10 "$1"
+    else
+        return 1
+    fi
+}
+
+# Print the version of the latest GitHub release, e.g. 2.1.0
+gb_latest_version() {
+    local json tag
+    json=$(_gb_fetch "https://api.github.com/repos/$GB_REPO/releases/latest" 2>/dev/null) || return 1
+    tag=$(printf '%s\n' "$json" | sed -n 's/.*"tag_name": *"\([^"]*\)".*/\1/p' | head -n 1)
+    tag="${tag#v}"
+    [[ "$tag" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || return 1
+    echo "$tag"
+}
+
+# Returns 0 if version $1 is newer than the running one
+_gb_is_newer() {
+    [[ "$1" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] && ! _gb_version_ge "$VERSION" "$1"
+}
+
+# =============================================================================
+# Update
+# =============================================================================
+
+# Install version $1 the way this copy was installed
+gb_self_update_to() {
+    local latest="$1" method
+    method=$(gb_install_method)
+    case "$method" in
+        npm|pnpm)
+            local -a cmd=(npm install -g "gitbash@$latest")
+            [[ "$method" == "pnpm" ]] && cmd=(pnpm add -g "gitbash@$latest")
+            print_info "Running: ${cmd[*]}"
+            if ! "${cmd[@]}"; then
+                print_error "Update failed. Run '${cmd[*]}' yourself (it may need more permissions)."
+                return 1
+            fi
+            ;;
+        script)
+            _gb_self_update_script "$latest" || return 1
+            ;;
+        npx)
+            print_info "gitbash runs through npx: use 'npx gitbash@latest' to get the newest version."
+            return 1
+            ;;
+        git)
+            print_info "gitbash runs from a git checkout ($SCRIPT_DIR): update it with 'git pull'."
+            return 1
+            ;;
+        package)
+            print_info "gitbash is a dependency in $SCRIPT_DIR: update it with your package manager."
+            return 1
+            ;;
+        *)
+            print_error "Could not detect how gitbash was installed ($SCRIPT_DIR)."
+            echo "Reinstall it with 'npm i -g gitbash' or the install script (see the README)." >&2
+            return 1
+            ;;
+    esac
+
+    # GITBASH_BIN, not SCRIPT_DIR: pnpm installs the new version in a new folder
+    local installed pkg_dir="${GITBASH_BIN%/bin/gitbash}"
+    installed=$(grep -o '"version": *"[^"]*"' "$pkg_dir/package.json" 2>/dev/null | head -1 | cut -d'"' -f4)
+    if [[ "$installed" != "$latest" ]]; then
+        print_error "Update finished, but gitbash in $pkg_dir is still at ${installed:-an unknown version}."
+        return 1
+    fi
+    print_success "Updated gitbash $VERSION → $latest"
+}
+
+# Re-run the install script of the new release for the same locations
+_gb_self_update_script() {
+    local latest="$1" bin_dir="" key value tmp
+    if [[ -f "$SCRIPT_DIR/.gitbash-install" ]]; then
+        while IFS='=' read -r key value; do
+            [[ "$key" == "bin_dir" ]] && bin_dir="$value"
+        done < "$SCRIPT_DIR/.gitbash-install"
+    fi
+    bin_dir="${bin_dir:-$HOME/.local/bin}"
+
+    local -a vars=(GITBASH_VERSION="$latest" GITBASH_INSTALL_DIR="$SCRIPT_DIR" GITBASH_BIN_DIR="$bin_dir")
+    local hint="curl -fsSL https://raw.githubusercontent.com/$GB_REPO/main/install.sh | sudo ${vars[*]} sh"
+    if [[ ! -w "$(dirname "$SCRIPT_DIR")" ]]; then
+        print_error "No permission to write to $(dirname "$SCRIPT_DIR"). Update with:"
+        echo "  $hint" >&2
+        return 1
+    fi
+
+    tmp=$(mktemp 2>/dev/null || mktemp -t gitbash) || return 1
+    if ! _gb_fetch "https://raw.githubusercontent.com/$GB_REPO/v$latest/install.sh" > "$tmp" 2>/dev/null ||
+       [[ ! -s "$tmp" ]]; then
+        rm -f "$tmp"
+        print_error "Could not download the install script of gitbash $latest."
+        return 1
+    fi
+    print_info "Running the install script of gitbash $latest"
+    if ! env "${vars[@]}" sh "$tmp"; then
+        rm -f "$tmp"
+        print_error "Update failed."
+        return 1
+    fi
+    rm -f "$tmp"
+}
+
+# gitbash --update
+gb_self_update() {
+    local latest
+    print_info "Checking for updates..."
+    if ! latest=$(gb_latest_version); then
+        print_error "Could not check for updates (no network, or GitHub is not reachable)."
+        return 1
+    fi
+    _gb_update_state_set checked "$(_gb_now)"
+    _gb_update_state_set latest "$latest"
+    if ! _gb_is_newer "$latest"; then
+        print_success "gitbash $VERSION is up to date."
+        return 0
+    fi
+    gb_self_update_to "$latest"
+}
+
+# =============================================================================
+# Background check
+# =============================================================================
+
+# Returns 0 if update checks are on: not turned off, not in CI, not a git checkout
+gb_update_checks_enabled() {
+    case "$_GB_ENV_NO_UPDATE_CHECKS" in
+        "") [[ "${GITBASH_NO_UPDATE_CHECKS:-no}" == "yes" ]] && return 1 ;;
+        no|0|false) ;;
+        *) return 1 ;;
+    esac
+    local var
+    for var in CI CONTINUOUS_INTEGRATION BUILD_NUMBER GITHUB_ACTIONS GITLAB_CI TF_BUILD \
+               JENKINS_URL BUILDKITE CIRCLECI TRAVIS TEAMCITY_VERSION BITBUCKET_BUILD_NUMBER; do
+        case "${!var:-}" in
+            ""|false|0) ;;
+            *) return 1 ;;
+        esac
+    done
+    [[ ! -e "$SCRIPT_DIR/.git" ]]
+}
+
+# Run before a command: start a background check when one is due, and offer a
+# known new version (at most every other day, never again for a skipped one).
+# On a successful update, runs the command with the new version instead.
+# Usage: gb_update_check <command> [args...]
+gb_update_check() {
+    # Not when gitbash runs itself from a command (the parent already checked)
+    [[ -z "${GITBASH_NESTED:-}" ]] || return 0
+    gb_update_checks_enabled || return 0
+
+    local now
+    now=$(_gb_now)
+    _gb_update_state_load
+    if (( now - _GB_UC_CHECKED >= GB_UPDATE_CHECK_INTERVAL || _GB_UC_CHECKED > now )); then
+        _gb_update_state_set checked "$now"
+        (
+            local latest
+            latest=$(gb_latest_version) && _gb_update_state_set latest "$latest"
+        ) < /dev/null > /dev/null 2>&1 &
+    fi
+
+    local latest="$_GB_UC_LATEST"
+    _gb_is_newer "$latest" || return 0
+    [[ "$latest" != "$_GB_UC_SKIPPED" ]] || return 0
+    (( now - _GB_UC_PROMPTED >= GB_UPDATE_PROMPT_INTERVAL || _GB_UC_PROMPTED > now )) || return 0
+    # Only ask people at a terminal, never scripts
+    [[ -t 0 && -t 1 && -t 2 && "${GITBASH_ASSUME_YES:-}" != "1" ]] || return 0
+    local arg
+    for arg in "${@:2}"; do
+        [[ "$arg" == "-y" || "$arg" == "--yes" ]] && return 0
+    done
+
+    _gb_update_state_set prompted "$now"
+    print_info "gitbash $latest is available (you have $VERSION)."
+    local choice
+    gb_choice choice "Update now? [y]es, [n]ot now, [s]kip this version (y/N/s):" "yns" "n"
+    case "$choice" in
+        y)
+            if gb_self_update_to "$latest"; then
+                echo
+                exec "$GITBASH_BIN" "$@"
+            fi
+            echo
+            ;;
+        s)
+            _gb_update_state_set skipped "$latest"
+            print_info "You won't be asked about $latest again. Run 'gitbash --update' to update any time."
+            echo
+            ;;
+        *)
+            print_info "Run 'gitbash --update' to update any time."
+            echo
+            ;;
+    esac
+    return 0
+}

package/commands/_utils.sh

@@ -9,7 +9,29 @@ if [[ -n "${_GB_UTILS_LOADED:-}" ]]; then
 fi
 _GB_UTILS_LOADED=1
 
-GB_FZF_MIN_VERSION="0.36.0"
+# =============================================================================
+# Platform
+# =============================================================================
+
+# Git Bash (MSYS2) or Cygwin on Windows
+gb_is_windows() {
+    case "${OSTYPE:-}" in
+        msys*|cygwin*) return 0 ;;
+    esac
+    return 1
+}
+
+# Linux in WSL
+_gb_is_wsl() {
+    [[ -n "${WSL_DISTRO_NAME:-}" || -n "${WSL_INTEROP:-}" ]]
+}
+
+# On Windows, fzf runs previews with bash and quotes {} for it since 0.54
+if gb_is_windows; then
+    GB_FZF_MIN_VERSION="0.54.0"
+else
+    GB_FZF_MIN_VERSION="0.36.0"
+fi
 
 # =============================================================================
 # Output
@@ -20,6 +42,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 +72,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 +158,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 +236,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 +253,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
@@ -244,7 +308,11 @@ _gb_version_ge() {
 # Check that fzf is installed and recent enough
 require_fzf() {
     if ! command -v fzf >/dev/null 2>&1; then
-        print_error "fzf is not installed. Install it with 'brew install fzf' (macOS) or 'sudo apt install fzf' (Debian/Ubuntu)."
+        if gb_is_windows; then
+            print_error "fzf is not installed. Install it with 'winget install junegunn.fzf'."
+        else
+            print_error "fzf is not installed. Install it with 'brew install fzf' (macOS) or 'sudo apt install fzf' (Debian/Ubuntu)."
+        fi
         return 1
     fi
     local version
@@ -310,6 +378,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 +545,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 +571,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,10 +609,63 @@ 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"
-    if command -v open >/dev/null 2>&1 && [[ "$(uname -s)" == "Darwin" ]]; then
+    if gb_is_windows && command -v rundll32 >/dev/null 2>&1; then
+        # Not cmd's start: it would need & and ^ in the URL escaped
+        rundll32 url.dll,FileProtocolHandler "$url"
+    elif _gb_is_wsl && command -v wslview >/dev/null 2>&1; then
+        wslview "$url"
+    elif _gb_is_wsl && command -v rundll32.exe >/dev/null 2>&1; then
+        rundll32.exe url.dll,FileProtocolHandler "$url"
+    elif command -v open >/dev/null 2>&1 && [[ "$(uname -s)" == "Darwin" ]]; then
         open "$url"
     elif command -v xdg-open >/dev/null 2>&1; then
         xdg-open "$url" >/dev/null 2>&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.
@@ -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.