gitbash 1.6.1 → 1.6.3

package/README.md

@@ -2,7 +2,7 @@
 
 Interactive git utilities for bash with fzf-powered menus.
 
-![screenshot-status.png](./doc/screenshot-status.png)
+![screenshot-status.png](./docs/screenshot-status.png)
 
 ## Installation
 

package/commands/branch.sh

@@ -152,25 +152,13 @@ EOF
     # -----------------------------
     case "$selection" in
         "$create_option")
-            # Use SCRIPT_DIR from parent or compute it
-            if [[ -z "${SCRIPT_DIR:-}" ]]; then
-              SCRIPT_DIR="$(cd "$SOURCE_DIR/.." && pwd)"
-            fi
-            "$SCRIPT_DIR/bin/gitbash" create
+            gitbash create
             ;;
         "$switch_option")
-            # Use SCRIPT_DIR from parent or compute it
-            if [[ -z "${SCRIPT_DIR:-}" ]]; then
-              SCRIPT_DIR="$(cd "$SOURCE_DIR/.." && pwd)"
-            fi
-            "$SCRIPT_DIR/bin/gitbash" switch
+            gitbash switch
             ;;
         "$update_option")
-            # Use SCRIPT_DIR from parent or compute it
-            if [[ -z "${SCRIPT_DIR:-}" ]]; then
-              SCRIPT_DIR="$(cd "$SOURCE_DIR/.." && pwd)"
-            fi
-            "$SCRIPT_DIR/bin/gitbash" update
+            gitbash update
             ;;
         "$abort_label")
             echo "Aborted."

package/commands/cleanup.sh

@@ -164,21 +164,14 @@ EOF
     recent_branches=()
 
     # Variables for loop (declared once to avoid zsh output on redeclaration)
-    local last_commit_ts relative_date author_email author_name
     local has_remote configured_upstream entry
 
     # Process each local branch
-    while IFS= read -r branch; do
+    while IFS='|' read -r branch last_commit_ts relative_date author_email author_name; do
         # Skip base branch
         [[ "$branch" == "$base_branch" ]] && continue
         [[ -z "$branch" ]] && continue
 
-        # Get last commit info for all branches
-        last_commit_ts=$(git log -1 --format='%ct' "$branch" 2>/dev/null)
-        relative_date=$(git log -1 --format='%cr' "$branch" 2>/dev/null)
-        author_email=$(git log -1 --format='%ae' "$branch" 2>/dev/null)
-        author_name=$(git log -1 --format='%an' "$branch" 2>/dev/null)
-        
         # Check if remote branch exists
         has_remote=false
         if echo "$remote_branches" | grep -qx "$branch"; then
@@ -201,7 +194,7 @@ EOF
             # Recent: has recent activity (don't pre-select)
             recent_branches+=("$entry")
         fi
-    done < <(git for-each-ref --format='%(refname:short)' refs/heads)
+    done < <(git for-each-ref --format='%(refname:short)|%(committerdate:unix)|%(committerdate:relative)|%(committeremail)|%(committername)' refs/heads)
 
     # Sort each category by timestamp (most recent first), compatible with bash 3.x (no mapfile)
     _sort_desc() {

package/commands/pr.sh

@@ -93,14 +93,8 @@ EOF
         echo "Continuing without committing..."
         ;;
       *)
-        # Use SCRIPT_DIR from parent or compute it
-        if [[ -z "${SCRIPT_DIR:-}" ]]; then
-          SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
-          SCRIPT_DIR="$(cd "$SOURCE_DIR/.." && pwd)"
-        fi
-        
         # Run status command for interactive staging and committing
-        "$SCRIPT_DIR/bin/gitbash" status
+        gitbash status
         if [[ $? -ne 0 ]]; then
           echo "Commit cancelled or failed. Aborting PR creation."
           return 1

package/commands/stashes.sh

@@ -151,25 +151,13 @@ EOF
     # -----------------------------
     case "$selection" in
         "$stash_option")
-            # Use SCRIPT_DIR from parent or compute it
-            if [[ -z "${SCRIPT_DIR:-}" ]]; then
-              SCRIPT_DIR="$(cd "$SOURCE_DIR/.." && pwd)"
-            fi
-            "$SCRIPT_DIR/bin/gitbash" stash
+            gitbash stash
             ;;
         "$unstash_option")
-            # Use SCRIPT_DIR from parent or compute it
-            if [[ -z "${SCRIPT_DIR:-}" ]]; then
-              SCRIPT_DIR="$(cd "$SOURCE_DIR/.." && pwd)"
-            fi
-            "$SCRIPT_DIR/bin/gitbash" unstash
+            gitbash unstash
             ;;
         "$cleanup_option")
-            # Use SCRIPT_DIR from parent or compute it
-            if [[ -z "${SCRIPT_DIR:-}" ]]; then
-              SCRIPT_DIR="$(cd "$SOURCE_DIR/.." && pwd)"
-            fi
-            "$SCRIPT_DIR/bin/gitbash" cleanstash
+            gitbash cleanstash
             ;;
         "$abort_label")
             echo "Aborted."

package/commands/status.sh

@@ -306,12 +306,8 @@ EOF
       echo "Ready to commit and push staged changes."
       echo "Press Ctrl+C to abort."
       echo
-      # Use SCRIPT_DIR from parent or compute it
-      if [[ -z "${SCRIPT_DIR:-}" ]]; then
-        SCRIPT_DIR="$(cd "$SOURCE_DIR/.." && pwd)"
-      fi
       # Directly prompt for commit message (user can Ctrl+C to abort)
-      "$SCRIPT_DIR/bin/gitbash" commit -s -p
+      gitbash commit -s -p
       break
     fi
   done

package/docs/CONTRIBUTING.md

@@ -0,0 +1,138 @@
+# Contributing to gitbash
+
+Thank you for your interest in contributing to gitbash! This document outlines the process and guidelines for contributing to this project.
+
+## Getting Started
+
+1. Fork the repository
+2. Clone your fork locally
+3. Create a feature or bugfix branch (see Branch Naming below)
+4. Make your changes
+5. Add a changeset (see Changesets below)
+6. Push your branch and create a Pull Request
+
+## Branch Naming
+
+All contributions **must** be made through feature or bugfix branches. Direct commits to `main` won't be merged.
+
+### Branch naming convention:
+- **Feature branches**: `feature/<issue-number>-<description>` or `feature/NOISSUE-<description>`
+- **Bugfix branches**: `bugfix/<issue-number>-<description>` or `bugfix/NOISSUE-<description>`
+
+Examples:
+```bash
+feature/42-add-rebase-command
+feature/NOISSUE-improve-error-messages
+bugfix/15-fix-stale-branch-filtering
+bugfix/NOISSUE-fix-typo-in-help
+```
+
+You can use the built-in `gitbash create` command to create properly formatted branches:
+```bash
+./bin/gitbash create
+```
+
+## Pull Requests
+
+All contributions must be submitted via Pull Request (PR):
+
+1. **One feature/fix per PR** - Keep PRs focused and atomic
+2. **Descriptive title** - Clearly describe what the PR does
+3. **Description** - Explain the motivation and implementation details
+4. **Reference issues** - Link to related issues if applicable
+5. **Include a changeset** - See below for details
+
+### PR Requirements:
+- [ ] Branch follows naming convention (`feature/*` or `bugfix/*`)
+- [ ] Changeset has been added
+- [ ] Code works as intended
+- [ ] No breaking changes (unless discussed and approved)
+
+## Changesets
+
+We use [Changesets](https://github.com/changesets/changesets) to manage versions and changelogs. **Every PR must include a changeset.**.
+
+### How to add a changeset:
+
+1. After making your changes, run:
+   ```bash
+   npm run changeset
+   ```
+
+2. You'll be prompted to select the change type:
+   - **patch** - Bug fixes, small improvements (1.0.0 → 1.0.1)
+   - **minor** - New features, non-breaking changes (1.0.0 → 1.1.0)
+   - **major** - Breaking changes (1.0.0 → 2.0.0)
+
+3. Write a clear, user-facing description of the change:
+   ```
+   Added --all option to stale command to show all branches by default
+   ```
+
+4. A changeset file will be created in `.changeset/` - commit this with your PR:
+   ```bash
+   ./bin/gitbash commit "feat: Add changeset for stale command enhancement"
+   ```
+
+### Example changeset workflow:
+
+```bash
+# 1. Create your feature branch
+./bin/gitbash create
+# Select "feature", enter "NOISSUE" or issue number, add description
+
+# 2. Make your changes
+vim commands/stale.sh
+
+# 3. Add a changeset
+npm run changeset
+# Select "minor" (new feature)
+# Enter: "Added --all option to stale command to start in all branches mode"
+
+# 4. Commit everything
+./bin/gitbash commit "feat: add --all option to stale command"
+
+# 5. Push and create PR
+./bin/gitbash pr -p
+```
+
+### What happens to changesets:
+
+When your PR is merged:
+1. The changeset file is included in the main branch
+2. When ready for release, maintainers run `npm run version`
+3. Changesets are consumed and version is bumped
+4. CHANGELOG.md is automatically updated
+5. Changes are published with `npm run release`
+
+## Development Guidelines
+
+### Testing your changes:
+```bash
+# Test the gitbash command directly
+./bin/gitbash <command>
+
+# Example: test the stale command
+./bin/gitbash stale --all
+```
+
+### Code style:
+- Follow existing bash script conventions
+- Use shellcheck for linting when possible
+- Keep functions focused and well-documented
+- Include help text for new commands/options
+- Keep the readme updated and as terse as possible
+
+### Documentation:
+- Update command help text (`-h, --help`) for new features
+- Update README.md if adding new commands
+- Add usage examples for new features
+
+## Questions or Issues?
+
+If you have questions or run into issues:
+- Check existing issues and discussions
+- Create a new issue for bugs or feature requests
+- Reach out in your PR if you need guidance
+
+Thank you for contributing! 🎉 You rock!

package/docs/SECURITY.md

@@ -0,0 +1,63 @@
+# Security Policy
+
+## Supported Versions
+
+The following versions of this project are currently receiving security updates:
+
+| Version | Supported |
+|--------|-----------|
+| 1.x.x  | ✅        |
+| < 1.0  | ❌        |
+
+Security fixes are only applied to the latest minor/patch release of the **1.x.x** series. Older versions must be upgraded to receive patches.
+
+---
+
+## Reporting a Vulnerability
+
+We take security vulnerabilities seriously and appreciate your efforts to responsibly disclose them.
+
+### How to Report
+
+- **Email:** `matthias.jaeggli@gmail.com`
+- **Do not** open a public GitHub issue for security concerns.
+
+### Response Expectations
+
+- We will acknowledge your report **within 48 hours**.
+- You will receive progress updates **at least weekly** until the issue is resolved.
+- If additional information is needed, we will contact you directly.
+
+### After You Report
+
+After we receive your report:
+
+1. We assess and validate the vulnerability.
+2. If confirmed, we classify its severity and begin developing a fix.
+3. We work with you on a responsible disclosure timeline.
+4. A patched release is published along with a security advisory.
+5. If the issue is not accepted, we will explain why.
+
+### Responsible Disclosure
+
+To protect users, please avoid public disclosure until:
+
+- A fix has been released, **or**
+- 30 days have passed since we acknowledged the report (unless otherwise agreed).
+
+---
+
+## Preferred Report Format
+
+When reporting, please include:
+
+- A description of the vulnerability.
+- Steps to reproduce or a proof-of-concept.
+- Expected vs. actual behavior.
+- Affected versions.
+- Impact and severity (if known).
+- Optional: suggested remediation ideas.
+
+---
+
+Thank you for helping improve the security of this project.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitbash",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "Opinionated git utilities for bash with fzf-powered menus",
   "author": "jaggli",
   "license": "MIT",
@@ -29,7 +29,7 @@
   "files": [
     "bin/",
     "commands/",
-    "doc/",
+    "docs/",
     "README.md",
     "LICENSE"
   ],