git-jira-shortcuts 1.0.13 → 1.0.16

package/README.md

@@ -26,7 +26,7 @@ The `init` command will walk you through configuration and add the necessary sou
 
 ## Configuration
 
-Running `git-jira-shortcuts init` creates `~/.git-jira-shortcuts.env` with:
+Running `git-jira-shortcuts init` creates `~/.git-jira-shortcuts.env` with your machine-wide settings:
 
 | Variable | Required | Description |
 |----------|----------|-------------|
@@ -34,6 +34,26 @@ Running `git-jira-shortcuts init` creates `~/.git-jira-shortcuts.env` with:
 | `GJS_JIRA_DOMAIN` | Yes | Jira domain (e.g. `yourco.atlassian.net`) |
 | `GJS_JIRA_API_TOKEN` | Yes | Base64-encoded Jira API token |
 | `GJS_BRANCH_WEBHOOK_URL` | No | Optional webhook for branch name generation |
+| `GJS_BRANCH_ALIASES` | No | Override `m`/`d` shorthand (e.g. `("m:main" "d:develop")`) |
+
+### Per-repo config
+
+Different repos can use different branch names (e.g. `main` vs `master`). Add a `.git-jira-shortcuts` file to any repo root to override your global settings for that repo:
+
+```bash
+# my-repo/.git-jira-shortcuts
+GJS_BRANCH_ALIASES=("m:main" "d:develop")
+GJS_TICKET_PREFIX=OTHERPROJ
+```
+
+The file is sourced automatically when you `cd` into the repo, and your global settings are restored when you leave. Any `GJS_*` variable can be overridden this way.
+
+You'll probably want to add this to your global gitignore so it doesn't get committed:
+
+```bash
+echo ".git-jira-shortcuts" >> ~/.gitignore_global
+git config --global core.excludesfile ~/.gitignore_global
+```
 
 ### Generating your Jira API token
 
@@ -61,7 +81,7 @@ Running `git-jira-shortcuts init` creates `~/.git-jira-shortcuts.env` with:
 ### Branching
 | Command | Alias | Description |
 |---------|-------|-------------|
-| `gswitch [branch]` | `gw` | Switch branches with interactive picker (↑/↓ arrows) |
+| `gswitch [branch] [--force]` | `gw` | Switch branches with interactive picker (↑/↓). `--force` skips uncommitted and unpushed guards. |
 | `gstart <branch\|ticket#>` | `gt`, `gcreate` | Create or switch to branch, auto-names from Jira |
 | `gdelete [branch]` | `gdel` | Delete feature branch if clean and pushed |
 | `gmerge [branch]` | `gm` | Merge branch into current if no conflicts |
@@ -108,9 +128,24 @@ gc fix the bug   # Commits as "PROJ-1234: fix the bug"
 ```
 
 ### Branch shorthand
+By default:
 - `m` → `master`
 - `d` → `develop`
 
+To customize these (e.g. if your repo uses `main` instead of `master`), set `GJS_BRANCH_ALIASES` in `~/.git-jira-shortcuts.env`:
+
+```bash
+GJS_BRANCH_ALIASES=("m:main" "d:develop")
+```
+
+You can add as many aliases as you want:
+
+```bash
+GJS_BRANCH_ALIASES=("m:main" "d:dev" "s:staging")
+```
+
+When `GJS_BRANCH_ALIASES` is set, the defaults are replaced entirely — so include all the aliases you want.
+
 ## Update
 
 ```bash

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-jira-shortcuts",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "description": "Git + Jira workflow shortcuts for zsh — interactive branch switching, auto-prefixed commits, Jira integration, and more.",
   "author": "chipallen2",
   "license": "MIT",

package/shell/git-extras.sh

@@ -2,7 +2,7 @@
 # git-jira-shortcuts — Git + Jira workflow shortcuts for zsh
 # https://github.com/chipallen2/git-jira-shortcuts
 #
-# Configuration (set in ~/.git-jira-shortcuts.env):
+# Global configuration (set in ~/.git-jira-shortcuts.env):
 #   GJS_TICKET_PREFIX      — Jira project key (e.g. MYPROJ, ACME)
 #   GJS_JIRA_DOMAIN        — Jira domain (e.g. yourco.atlassian.net)
 #   GJS_JIRA_API_TOKEN     — Base64 Jira API token
@@ -10,6 +10,10 @@
 #   GJS_REPOS              — Optional array of repo paths for grepos
 #   GJS_CLEAN_PROTECTED    — Optional array of branch names to never delete with gclean
 #   GJS_BRANCH_ALIASES     — Optional array of branch aliases (e.g. "m:master" "d:develop")
+#
+# Per-repo overrides (set in <repo-root>/.git-jira-shortcuts):
+#   Same variables as above — auto-loaded on cd, reset to global on leave.
+#   Example: GJS_BRANCH_ALIASES=("m:main" "d:develop")
 
 # Store path to this script for self-reference (used by ghelp)
 GJS_SHELL_SCRIPT_PATH="${0:A}"
@@ -43,6 +47,45 @@ _gjs_check_upgrade() {
   fi
 }
 
+###
+### PER-REPO CONFIG
+###
+
+# Snapshot global values (from ~/.git-jira-shortcuts.env) so they can be
+# restored when leaving a repo that has local overrides.
+_GJS_GLOBAL_TICKET_PREFIX="${GJS_TICKET_PREFIX:-}"
+_GJS_GLOBAL_BRANCH_WEBHOOK_URL="${GJS_BRANCH_WEBHOOK_URL:-}"
+if [[ -n "${GJS_BRANCH_ALIASES+x}" ]]; then
+  _GJS_GLOBAL_BRANCH_ALIASES=("${GJS_BRANCH_ALIASES[@]}")
+  _GJS_GLOBAL_BRANCH_ALIASES_ISSET=1
+else
+  _GJS_GLOBAL_BRANCH_ALIASES=()
+  _GJS_GLOBAL_BRANCH_ALIASES_ISSET=0
+fi
+
+# Load .git-jira-shortcuts from the current repo root (if present),
+# overriding global values. Resets to globals first so leaving a repo
+# with local overrides cleanly reverts to the machine-wide config.
+_gjs_apply_repo_config() {
+  GJS_TICKET_PREFIX="$_GJS_GLOBAL_TICKET_PREFIX"
+  GJS_BRANCH_WEBHOOK_URL="$_GJS_GLOBAL_BRANCH_WEBHOOK_URL"
+  if [[ "$_GJS_GLOBAL_BRANCH_ALIASES_ISSET" -eq 1 ]]; then
+    GJS_BRANCH_ALIASES=("${_GJS_GLOBAL_BRANCH_ALIASES[@]}")
+  else
+    unset GJS_BRANCH_ALIASES
+  fi
+
+  local git_root
+  git_root=$(git rev-parse --show-toplevel 2>/dev/null) || return 0
+  local rc_file="$git_root/.git-jira-shortcuts"
+  [[ -f "$rc_file" ]] && source "$rc_file"
+}
+
+# Auto-apply on directory change and immediately for the current directory.
+autoload -U add-zsh-hook 2>/dev/null
+add-zsh-hook chpwd _gjs_apply_repo_config
+_gjs_apply_repo_config
+
 ###
 ### INTERNAL HELPERS
 ###
@@ -334,7 +377,7 @@ ghelp() { # ghelp | Show all git-jira-shortcuts commands
 
 ── Branching ──────────────────────────────────────────────────
   gw [branch]         Switch branches — arrow-key picker if no branch given
-    gswitch             (same, also accepts --force / -f)
+    gswitch             (same, also accepts --force / -f to skip dirty or unpushed guards)
   gt <branch|ticket#> Create or switch to a branch — auto-names from Jira
     gstart, gcreate     (same)
   gdel [branch]       Delete a branch — interactive picker, safety checks
@@ -553,7 +596,7 @@ greset() { # greset [*file] | Reset a specific file with confirmation (interacti
 }
 alias gr='greset' # greset [*file] | Alias for greset
 
-gswitch() { # gswitch [*branch] [--force|-f] | Switch branches (optionally bypass local-dirty guard)
+gswitch() { # gswitch [*branch] [--force|-f] | Switch branches (bypass dirty tree / unpushed guards with --force)
   local force_switch=0
   local -a positional=()
   local arg
@@ -580,8 +623,9 @@ gswitch() { # gswitch [*branch] [--force|-f] | Switch branches (optionally bypas
   local unpushed
   unpushed=$(git log origin/"$branch"..HEAD --oneline 2>/dev/null)
 
-  if [[ -n "$unpushed" ]]; then
+  if [[ $force_switch -eq 0 && -n "$unpushed" ]]; then
     echo "🚫 You have commits on '$branch' not pushed to origin. Push them first."
+    echo "   Use 'gw --force [branch]' to switch anyway."
     return 1
   fi
 
@@ -986,6 +1030,7 @@ testJira() { # testJira | Test Jira API connection
 }
 alias tj='testJira' # testJira | Test Jira API connection
 
+unalias gclean 2>/dev/null
 gclean() { # gclean [--dry-run] | Delete local branches already merged to master (skips recent)
   local dry_run=0