gitbash 2.0.1 → 2.1.0

package/commands/reset-repo.sh

@@ -0,0 +1,200 @@
+#!/usr/bin/env bash
+
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
+# Abort an unfinished merge, rebase, cherry-pick, revert or am
+_reset_repo_abort_operations() {
+  local path
+  if [[ -d "$(git rev-parse --git-path rebase-merge)" || -d "$(git rev-parse --git-path rebase-apply)" ]]; then
+    path=$(git rev-parse --git-path rebase-apply)
+    if [[ -f "$path/applying" ]]; then
+      git am --abort >/dev/null 2>&1
+    else
+      git rebase --abort >/dev/null 2>&1
+    fi
+  fi
+  [[ -f "$(git rev-parse --git-path MERGE_HEAD)" ]] && git merge --abort >/dev/null 2>&1
+  [[ -f "$(git rev-parse --git-path CHERRY_PICK_HEAD)" ]] && git cherry-pick --abort >/dev/null 2>&1
+  [[ -f "$(git rev-parse --git-path REVERT_HEAD)" ]] && git revert --abort >/dev/null 2>&1
+  return 0
+}
+
+# Reset the current branch to its state on the remote and delete all
+# untracked and ignored files, like a fresh clone
+reset-repo() {
+  local dry_run=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: reset-repo [OPTIONS]
+
+Reset the current branch like a fresh clone: discard all local changes and
+unpushed commits, and delete untracked and ignored files (build output,
+node_modules, ...).
+
+Options:
+  -n, --dry-run   Only show what would be reset and deleted
+  -y, --yes       Don't ask for confirmation
+  -h, --help      Show this help message
+
+Behavior:
+  - Fetches the configured remote (GITBASH_REMOTE, default: origin) and resets
+    the branch to <remote>/<branch>; a branch that is not on the remote keeps
+    its commits and only loses the local changes
+  - Aborts an unfinished merge, rebase, cherry-pick or revert first
+  - Keeps files matching GITBASH_RESET_KEEP (space-separated .gitignore
+    patterns, e.g. '.env .idea/'), .gitbashrc-user and nested repositories
+  - Stashes and other branches are not touched
+  - Commits that are lost can be recovered with 'git reflog' for a while
+
+Examples:
+  $ reset-repo --dry-run
+  $ reset-repo
+
+EOF_HELP
+        return 0
+        ;;
+      -n|--dry-run)
+        dry_run=true
+        shift
+        ;;
+      -y|--yes)
+        export GITBASH_ASSUME_YES=1
+        shift
+        ;;
+      *)
+        print_error "Unknown argument: $1"
+        echo "Usage: reset-repo [--dry-run] [--yes]" >&2
+        return 1
+        ;;
+    esac
+  done
+
+  require_git_repo || return 1
+
+  local repo_root
+  repo_root=$(git rev-parse --show-toplevel) || return 1
+  cd "$repo_root" || return 1
+
+  # During a rebase HEAD is detached; the branch is the one being rebased
+  local branch="" head_name
+  for head_name in rebase-merge/head-name rebase-apply/head-name; do
+    head_name=$(git rev-parse --git-path "$head_name")
+    if [[ -f "$head_name" ]]; then
+      branch=$(cat "$head_name")
+      branch="${branch#refs/heads/}"
+      break
+    fi
+  done
+  if [[ -z "$branch" ]] && ! branch=$(gb_current_branch); then
+    print_error "Detached HEAD: check out a branch first."
+    return 1
+  fi
+
+  local remote target
+  remote=$(gb_remote)
+  if ! git remote get-url "$remote" >/dev/null 2>&1; then
+    print_error "No remote '$remote' configured."
+    return 1
+  fi
+  print_info "Fetching '$remote'..."
+  if ! git fetch --quiet --prune "$remote"; then
+    print_error "Failed to fetch '$remote'."
+    return 1
+  fi
+  if git show-ref --verify --quiet "refs/remotes/$remote/$branch"; then
+    target="$remote/$branch"
+  else
+    target="$branch"
+    print_warning "'$branch' is not on '$remote': keeping its commits, only local changes are discarded."
+  fi
+
+  # Patterns of files to keep (git clean -e); .gitbashrc-user is always kept
+  local -a keep clean_args
+  local pattern
+  IFS=' ' read -r -a keep <<< "${GITBASH_RESET_KEEP:-}"
+  keep+=(".gitbashrc-user")
+  clean_args=(-d -x)
+  for pattern in "${keep[@]}"; do
+    [[ -n "$pattern" ]] && clean_args+=(-e "$pattern")
+  done
+
+  # What would be lost
+  local lost_commits changes untracked
+  lost_commits=$(git log --oneline "$target..refs/heads/$branch")
+  changes=$(git status --porcelain --untracked-files=no)
+  untracked=$(git clean -n "${clean_args[@]}")
+
+  local head_commit
+  head_commit=$(git rev-parse "refs/heads/$branch")
+  if [[ -z "$lost_commits" && -z "$changes" && -z "$untracked" &&
+        "$(git rev-parse HEAD)" == "$(git rev-parse "$target")" ]]; then
+    _reset_repo_abort_operations
+    print_success "'$branch' is already like a fresh clone of '$target'."
+    return 0
+  fi
+
+  echo "Resetting '$branch' to '$target':"
+  if [[ -n "$lost_commits" ]]; then
+    echo
+    print_warning "$(printf '%s\n' "$lost_commits" | wc -l | tr -d ' ') unpushed commit(s) will be removed from '$branch':"
+    printf '%s\n' "$lost_commits" | sed 's/^/    /'
+  fi
+  if [[ -n "$changes" ]]; then
+    echo
+    echo "Local changes to discard:"
+    printf '%s\n' "$changes" | sed 's/^/    /'
+  fi
+  if [[ -n "$untracked" ]]; then
+    echo
+    echo "Untracked and ignored files to delete:"
+    printf '%s\n' "$untracked" | sed 's/^Would remove /    /'
+  fi
+  if [[ ${#keep[@]} -gt 1 ]]; then
+    echo
+    echo "Kept (GITBASH_RESET_KEEP): ${GITBASH_RESET_KEEP}"
+  fi
+  echo
+
+  if [[ "$dry_run" == true ]]; then
+    print_info "Dry run - nothing was changed."
+    return 0
+  fi
+
+  if ! gb_confirm "Reset '$branch' and delete these files?" n; then
+    print_info "Aborted - nothing was changed."
+    return 1
+  fi
+
+  _reset_repo_abort_operations
+  if [[ "$(gb_current_branch)" != "$branch" ]] && ! git switch --quiet --force "$branch"; then
+    print_error "Failed to check out '$branch'."
+    return 1
+  fi
+  if ! git reset --quiet --hard "$target"; then
+    print_error "Failed to reset '$branch' to '$target'."
+    return 1
+  fi
+  if ! git clean -q -f "${clean_args[@]}"; then
+    print_error "Failed to delete untracked files."
+    return 1
+  fi
+  if [[ -f .gitmodules ]]; then
+    git submodule update --init --recursive --force --quiet ||
+      print_warning "Failed to update submodules."
+  fi
+
+  print_success "'$branch' is now like a fresh clone of '$target'."
+  if [[ -n "$lost_commits" ]]; then
+    print_info "Removed commits can be recovered with 'git reflog' (previous HEAD: ${head_commit:0:12})."
+  fi
+}

package/commands/stale.sh

@@ -28,7 +28,7 @@ stale() {
                 return 0
                 ;;
             -h|--help)
-                cat << 'EOF'
+                gb_help << 'EOF'
 Usage: stale [OPTIONS] [FILTER...]
 
 Show remote branches ordered by last commit date (oldest first) and delete
@@ -229,7 +229,7 @@ TOGGLE_EOF
                 echo \"Branch: $remote_q/\$branch\"
                 echo
                 echo 'Recent commits:'
-                git log --oneline --color=always -n 15 \"refs/remotes/$remote_q/\$branch\" 2>/dev/null || echo 'No commits found'
+                git log --oneline --color=\$GB_COLOR -n 15 \"refs/remotes/$remote_q/\$branch\" 2>/dev/null || echo 'No commits found'
             " \
             --preview-window=right:35% \
             < "$tmp_dir/$(cat "$tmp_dir/state")"

package/commands/stash.sh

@@ -11,7 +11,7 @@ stash() {
         return 0
     fi
     if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
-        cat << 'EOF'
+        gb_help << 'EOF'
 Usage: stash [NAME...]
 
 Create a git stash with a descriptive name.

package/commands/stashes.sh

@@ -14,7 +14,7 @@ stashes() {
         return 0
     fi
     if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
-        cat << 'EOF'
+        gb_help << 'EOF'
 Usage: stashes [OPTIONS]
 
 Interactive menu to manage git stashes.
@@ -87,7 +87,7 @@ Examples:
 Actions:
   💾 Stash       - Create a new stash with all changes
   📦 Unstash     - Apply stash to working directory, optionally drop it
-  🗑️  Clean up   - Delete stashes without applying (supports multi-select)
+  🗑️  Clean up    - Delete stashes without applying (supports multi-select)
 
 Requirements:
   - fzf (fuzzy finder)

package/commands/status.sh

@@ -45,7 +45,7 @@ status() {
     return 0
   fi
   if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
-    cat << 'EOF'
+    gb_help << 'EOF'
 Usage: status [OPTIONS]
 
 Interactive git status: stage, unstage, discard and commit with diff previews.
@@ -92,8 +92,8 @@ EOF
       echo "=== UNTRACKED ==="; echo
       if [[ -d "$file" ]]; then ls -la "$file"; else __BAT__ "$file" 2>/dev/null || echo "Cannot preview file"; fi
     else
-      staged=$(git diff --cached --color=always -- "$file" 2>/dev/null)
-      unstaged=$(git diff --color=always -- "$file" 2>/dev/null)
+      staged=$(git diff --cached --color=$GB_COLOR -- "$file" 2>/dev/null)
+      unstaged=$(git diff --color=$GB_COLOR -- "$file" 2>/dev/null)
       if [[ -n "$staged" ]]; then echo "=== STAGED CHANGES ==="; echo; printf "%s\n" "$staged" | __PAGER__; fi
       if [[ -n "$unstaged" ]]; then
         [[ -n "$staged" ]] && echo

package/commands/switch.sh

@@ -100,14 +100,15 @@ switch() {
       return 0
       ;;
     -h|--help)
-      cat << 'EOF'
+      gb_help << 'EOF'
 Usage: switch [FILTER...]
 
 Select a git branch using fzf and switch to it.
 
 Arguments:
   FILTER...     Optional search words to pre-fill fzf (joined with spaces).
-                If exactly one branch name contains them, switches directly.
+                Switches directly on an exact branch name, or if exactly
+                one branch name contains them.
 
 Options:
   -h, --help    Show this help message
@@ -152,10 +153,19 @@ EOF
   fi
 
   # -----------------------------
-  # Single match: switch directly
+  # Exact or single match: switch directly
   # -----------------------------
   local selected="" query="$filter"
   if [[ -n "$filter" ]]; then
+    # An exact branch name wins even if other branches contain it too
+    # (local first, then a remote branch like "origin/<filter>")
+    selected=$(printf '%s\n' "$branch_list" | awk -F'\t' -v f="$filter" '$2 == "local" && $3 == f { print; exit }')
+    if [[ -z "$selected" ]]; then
+      selected=$(printf '%s\n' "$branch_list" | awk -F'\t' -v f="$filter" '$2 == "remote" && ($3 == f || substr($3, index($3, "/") + 1) == f) { print; exit }')
+    fi
+    [[ -n "$selected" ]] && print_info "Exact match found, switching directly..."
+  fi
+  if [[ -n "$filter" && -z "$selected" ]]; then
     local matches match_count
     matches=$(printf '%s\n' "$branch_list" | awk -F'\t' '$2 != "spacer"' |
       while IFS= read -r line; do
@@ -192,9 +202,9 @@ EOF
             remote) ref=\"refs/remotes/\$name\" ;;
             *) echo 'Spacer - not selectable'; exit 0 ;;
           esac
-          git log --color=always -n 1 --format='%C(bold cyan)Author:%C(reset) %an%n%C(bold cyan)Date:%C(reset) %ar (%ad)%n%C(bold cyan)Message:%C(reset) %s%n' --date=format:'%Y-%m-%d %H:%M' \"\$ref\" 2>/dev/null
+          git log --color=\$GB_COLOR -n 1 --format='%C(bold cyan)Author:%C(reset) %an%n%C(bold cyan)Date:%C(reset) %ar (%ad)%n%C(bold cyan)Message:%C(reset) %s%n' --date=format:'%Y-%m-%d %H:%M' \"\$ref\" 2>/dev/null
           echo
-          git log --oneline --color=always -n 10 \"\$ref\" 2>/dev/null
+          git log --oneline --color=\$GB_COLOR -n 10 \"\$ref\" 2>/dev/null
         " \
         --preview-window=right:50% \
         --header="[Enter] switch | [Del] delete local branch | [Esc] exit | Current: $current_branch" \
@@ -232,25 +242,6 @@ EOF
   fi
   print_success "Switched to branch: $(gb_current_branch)"
 
-  # -----------------------------
   # Offer to fast-forward if behind the upstream
-  # -----------------------------
-  local now upstream_remote upstream_merge behind
-  now=$(gb_current_branch) || return 0
-  upstream_remote=$(git config "branch.$now.remote" 2>/dev/null) || return 0
-  upstream_merge=$(git config "branch.$now.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
+  gb_offer_fast_forward
 }

package/commands/unstash.sh

@@ -12,8 +12,8 @@ _stash_preview() {
     printf '%s' '
         sel=$(printf "%s" {} | grep -o "^stash@{[0-9]*}" || true)
         if [[ -n "$sel" ]]; then
-            { git stash show --include-untracked -p --color=always "$sel" 2>/dev/null ||
-              git stash show -p --color=always "$sel" 2>/dev/null; } | '"$pager"'
+            { git stash show --include-untracked -p --color=$GB_COLOR "$sel" 2>/dev/null ||
+              git stash show -p --color=$GB_COLOR "$sel" 2>/dev/null; } | '"$pager"'
         else
             echo "No preview"
         fi'
@@ -25,7 +25,7 @@ unstash() {
         return 0
     fi
     if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
-        cat << 'EOF'
+        gb_help << 'EOF'
 Usage: unstash [OPTIONS]
 
 Apply a git stash to your working directory with optional removal.
@@ -84,7 +84,9 @@ EOF
     fi
 
     echo "Applying $stash_id ..."
-    if ! git stash apply "$stash_id"; then
+    # The restored files are good news: list them in green, not git's red
+    if ! git -c color.status.changed=green -c color.status.untracked=green \
+            stash apply "$stash_id"; then
         print_error "Apply failed or had conflicts - the stash was kept."
         return 1
     fi

package/commands/update.sh

@@ -21,7 +21,7 @@ update() {
         return 0
         ;;
       -h|--help)
-        cat << 'EOF'
+        gb_help << 'EOF'
 Usage: update [OPTIONS]
 
 Merge the latest base branch (main/master) from the remote into the current branch.

package/docs/CONTRIBUTING.md

@@ -104,6 +104,7 @@ When your PR is merged:
 3. Changesets are consumed and version is bumped
 4. CHANGELOG.md is automatically updated
 5. Changes are published with `npm run release`
+6. Pushing the `vX.Y.Z` tag triggers the Release workflow, which creates the GitHub release with that version's CHANGELOG.md section as its notes (re-run it for an existing tag via "Run workflow")
 
 ## Development Guidelines
 

package/docs/SECURITY.md

@@ -20,7 +20,7 @@ Versions before 2.0 executed repository `.gitbashrc` files as shell code, so ope
 - Configuration files (`~/.gitbashrc`, a repository's `.gitbashrc` and `.gitbashrc-user`) are **parsed, never executed**. Only plain `GITBASH_*="value"` lines from a fixed list of settings are read; values containing `$`, backticks, backslashes or quotes are rejected.
 - A repository's committed `.gitbashrc` is treated as untrusted: it cannot set `GITBASH_MERGE_COMMAND` (the only setting that names a program to run). That setting is only read from `~/.gitbashrc` and `.gitbashrc-user`.
 - `gitbash --init` prints wrapper functions that call the installed `gitbash` binary; command code is not sourced into your shell.
-- `pr` never passes credentials from the remote URL to the browser.
+- `pr` and `repo` never pass credentials from the remote URL to the browser.
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitbash",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Opinionated git utilities for bash with fzf-powered menus",
   "author": "jaggli",
   "license": "MIT",
@@ -44,7 +44,7 @@
     "test": "bats test",
     "changeset": "changeset",
     "version": "changeset version",
-    "release": "npm run version && VERSION=$(node -p \"require('./package.json').version\") && ./bin/gitbash commit --yes -p \"chore: release v$VERSION\" && git tag \"v$VERSION\" && git push origin \"v$VERSION\" && npm publish"
+    "release": "scripts/release.sh"
   },
   "devDependencies": {
     "@changesets/cli": "^2.29.8",