gitbash 3.1.0 → 3.1.1

package/README.md

@@ -151,7 +151,7 @@ create --no-push PROJ-7 quick fix       # → feature/PROJ-7-quick-fix, not push
 switch [FILTER...]
 ```
 
-Switch branches with fzf. Shows local branches (`merged:` = fully merged into the base branch), then remote branches without a local copy. Preview shows commit history. Switches directly when the filter is an exact branch name or matches exactly one branch name. After switching, offers to fast-forward a branch that is behind.
+Switch branches with fzf. Shows local branches (`merged:` = fully merged into the base branch), then remote branches without a local copy. Preview shows commit history. Switches directly when the filter is an exact branch name or matches exactly one branch name; a branch name that is not known locally is fetched from the remote first, so `switch <branch>` also works for a branch pushed since the last fetch. After switching, offers to fast-forward a branch that is behind.
 
 - `Del` deletes the selected local branch (asks first, default no; unmerged commits need a second confirmation)
 

package/commands/_utils.sh

@@ -437,6 +437,30 @@ gb_ref_short() {
     echo "${ref#refs/heads/}"
 }
 
+# Fetch all branches of the remote and prune deleted ones, for commands that
+# can go on with local data. On failure, warns with git's own error.
+# git fails when a single ref can't be updated, even if all others were: on a
+# case-insensitive file system (macOS, Windows) it does so on every fetch when
+# the remote has branches whose names differ only in case (Feature/x, feature/x).
+# Usage: gb_fetch_prune <remote> [--silent]
+gb_fetch_prune() {
+    local remote="$1" silent="${2:-}" err refs
+    err=$(git fetch --prune --quiet "$remote" 2>&1 >/dev/null) && return 0
+    [[ "$silent" == "--silent" ]] && return 1
+
+    refs=$(printf '%s\n' "$err" | sed -n "s/^error: cannot lock ref 'refs\/remotes\/\([^']*\)'.*/\1/p" | sort -u)
+    if [[ -n "$refs" ]]; then
+        print_warning "Fetch could not update $(printf '%s\n' "$refs" | paste -sd ' ' -); all other branches were updated."
+        if [[ "$(git config --bool core.ignoreCase 2>/dev/null)" == "true" ]]; then
+            print_info "The remote probably has branches whose names differ only in case, which this file system can't keep apart. Delete or rename one of them on the remote, or store refs case-sensitively with 'git refs migrate --ref-format=reftable' (git 2.46+)."
+        fi
+    else
+        print_warning "Fetch failed; continuing with local data."
+    fi
+    printf '%s\n' "$err" | gb_sanitize | grep -v '^[[:space:]]*$' | head -n 5 | sed 's/^/    /' >&2
+    return 1
+}
+
 # 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() {

package/commands/cleanup.sh

@@ -134,8 +134,10 @@ EOF
 
   local remote
   remote=$(gb_remote)
-  if ! git fetch --prune --quiet "$remote" 2>/dev/null; then
-    [[ "$json_mode" == false ]] && print_warning "Fetch failed; continuing with local data."
+  if [[ "$json_mode" == true ]]; then
+    gb_fetch_prune "$remote" --silent
+  else
+    gb_fetch_prune "$remote"
   fi
 
   local base_branch base_ref

package/commands/stale.sh

@@ -132,8 +132,10 @@ EOF
     local remote
     remote=$(gb_remote)
     [[ "$json_mode" == false ]] && echo "Fetching latest from '$remote'..."
-    if ! git fetch --prune --quiet "$remote" 2>/dev/null; then
-        [[ "$json_mode" == false ]] && print_warning "Fetch failed; continuing with local data."
+    if [[ "$json_mode" == true ]]; then
+        gb_fetch_prune "$remote" --silent
+    else
+        gb_fetch_prune "$remote"
     fi
     GB_BASE=$(gb_base_branch 2>/dev/null) || GB_BASE=""
 

package/commands/switch.sh

@@ -39,6 +39,16 @@ _switch_list_branches() {
   done < <(git for-each-ref --format='%(refname:lstrip=2)' refs/remotes)
 }
 
+# Fetch one branch from the remote ("<name>" or "<remote>/<name>").
+# Returns 1 if it is not a valid branch name or the remote has no such branch.
+_switch_fetch_branch() {
+  local remote name
+  remote=$(gb_remote)
+  name="${1#"$remote"/}"
+  _gb_valid_branch_name "$name" || return 1
+  git fetch --quiet "$remote" "+refs/heads/$name:refs/remotes/$remote/$name" 2>/dev/null
+}
+
 # Delete the local branch of a list line (called from fzf via 'switch --delete-branch')
 _switch_delete_branch() {
   local line="$1" type name current count
@@ -110,7 +120,8 @@ Select a git branch using fzf and switch to it.
 Arguments:
   FILTER...     Optional search words to pre-fill fzf (joined with spaces).
                 Switches directly on an exact branch name, or if exactly
-                one branch name contains them.
+                one branch name contains them. A branch that is not known
+                locally is fetched from the remote first.
 
 Options:
   -h, --help    Show this help message
@@ -176,6 +187,17 @@ EOF
     fi
     [[ -n "$selected" ]] && print_info "Exact match found, switching directly..."
   fi
+  # Not in the list: it may be a branch that was pushed since the last fetch
+  if [[ -n "$filter" && -z "$selected" ]] && _switch_fetch_branch "$filter"; then
+    local remote name
+    remote=$(gb_remote)
+    name="${filter#"$remote"/}"
+    branch_list=$(_switch_list_branches)
+    # (the list shows the local branch instead, if "<remote>/<name>" has one)
+    selected=$(printf '%s\n' "$branch_list" | awk -F'\t' -v r="$remote/$name" -v n="$name" \
+      '($2 == "remote" && $3 == r) || ($2 == "local" && $3 == n) { print; exit }')
+    [[ -n "$selected" ]] && print_info "Found on $remote, switching directly..."
+  fi
   if [[ -n "$filter" && -z "$selected" ]]; then
     local matches match_count
     matches=$(printf '%s\n' "$branch_list" | awk -F'\t' '$2 != "spacer"' |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitbash",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Opinionated git utilities for bash with fzf-powered menus",
   "author": "jaggli",
   "license": "MIT",
@@ -52,7 +52,7 @@
     "version": "changeset version"
   },
   "devDependencies": {
-    "@changesets/cli": "^2.29.8",
+    "@changesets/cli": "^3.0.3",
     "bats": "^1.13.0"
   }
 }