gitbash 2.0.1 → 2.2.0

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
 
@@ -124,7 +125,7 @@ shellcheck -x bin/gitbash commands/*.sh
 
 Tests live in `test/*.bats`. Each test gets its own temporary repository with a local bare remote (`test/helpers/setup.bash`). fzf is replaced by a stub that records its arguments and answers from a plan (`test/helpers/bin/fzf`); `test/fzf_real.bats` drives the real fzf in a pseudo-terminal. Add a test for every bug fix.
 
-CI runs shellcheck and the tests on Ubuntu (bash 5) and macOS (bash 3.2 and 5).
+CI runs shellcheck and the tests on Ubuntu (bash 5), macOS (bash 3.2 and 5) and Windows (Git Bash). Scripts must keep LF line endings (`.gitattributes` enforces it).
 
 ### Code style:
 - Follow existing bash script conventions; scripts must work with bash 3.2

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.2.0",
   "description": "Opinionated git utilities for bash with fzf-powered menus",
   "author": "jaggli",
   "license": "MIT",
@@ -35,7 +35,8 @@
   ],
   "os": [
     "darwin",
-    "linux"
+    "linux",
+    "win32"
   ],
   "engines": {
     "node": ">=14"
@@ -44,7 +45,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",