gitbash 0.1.0

package/commands/update.sh

@@ -0,0 +1,191 @@
+# Update the current branch with the latest version of master/main
+update() {
+  local merge_tool="${GITBASH_FEATURE_BRANCH_PREFIX:-}"
+  local should_push=false
+
+  # Parse arguments
+  while [[ $# -gt 0 ]]; do
+    case $1 in
+      -h|--help)
+        cat << 'EOF'
+Usage: update [OPTIONS]
+
+Update the current feature branch with the latest changes from main/master.
+
+Options:
+  -p, --push    Push to origin after successful merge
+  -h, --help    Show this help message
+
+Configuration:
+  - Merge tool can be set by editing the 'GITBASH_MERGE_COMMAND' variable
+  - Default: "fork" 
+
+Behavior:
+  1. Detects whether your repo uses 'main' or 'master'
+  2. Fetches the latest base branch from origin
+  3. Merges it into your current branch
+  4. Optionally pushes the updated branch to origin
+  5. Opens merge tool if conflicts occur
+
+Examples:
+  $ git checkout feature/LOVE-123-new-feature
+  $ update
+  Fetching latest 'main' from origin...
+  Merging updated 'main' into 'feature/LOVE-123-new-feature'...
+  ✓ 'feature/LOVE-123-new-feature' is now up-to-date with 'main'.
+
+  ---
+
+  $ update --push
+  Fetching latest 'main' from origin...
+  Merging updated 'main' into 'feature/LOVE-123-new-feature'...
+  ✓ 'feature/LOVE-123-new-feature' is now up-to-date with 'main'.
+  Pushing 'feature/LOVE-123-new-feature' to origin...
+  ✓ Successfully pushed 'feature/LOVE-123-new-feature' to origin.
+
+  ---
+
+  $ update -p
+  Fetching latest 'main' from origin...
+  Merging updated 'main' into 'feature/dev-branch'...
+  ⚠ Merge completed with conflicts. Resolve them manually.
+  # Opens configured merge tool for conflict resolution
+
+Configuration:
+  - Merge tool can be changed by editing the 'GITBASH_MERGE_COMMAND' variable
+  - Options: "fork", "code", "gitkraken", "gitk", etc.
+
+Requirements:
+  - Must be in a git repository
+  - Must be on a feature branch (not main/master)
+  - Remote 'origin' must exist
+
+Notes:
+  - Uses fast-forward merge when possible
+  - Automatically opens merge tool if conflicts occur
+  - Local main/master is updated without checkout
+
+EOF
+        return 0
+        ;;
+      -p|--push)
+        should_push=true
+        shift
+        ;;
+      *)
+        echo "Unknown option: $1"
+        echo "Usage: update [-p|--push]"
+        return 1
+        ;;
+    esac
+  done
+
+  # Ensure we're in a git repo
+  if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+    echo "Not inside a git repository."
+    return 1
+  fi
+
+  current_branch=$(git rev-parse --abbrev-ref HEAD)
+
+  # Detect base branch: main or master
+  if git show-ref --verify --quiet refs/heads/main; then
+    base_branch="main"
+  elif git show-ref --verify --quiet refs/heads/master; then
+    base_branch="master"
+  else
+    echo "Could not detect 'main' or 'master' locally."
+    return 1
+  fi
+
+  if [[ "$current_branch" == "$base_branch" ]]; then
+    # Already on main/master - just pull the latest changes
+    echo "Pulling latest changes for '$base_branch' from origin..."
+    git pull origin "$base_branch"
+    
+    if [[ $? -eq 0 ]]; then
+      echo "✓ '$base_branch' is now up-to-date."
+    else
+      echo "⚠ Failed to pull latest changes."
+      return 1
+    fi
+    return 0
+  fi
+
+  # Check for uncommitted changes before merging
+  if [[ -n "$(git status --porcelain)" ]]; then
+    echo ""
+    echo "You have uncommitted changes:"
+    git status --short
+    echo ""
+    read -rp "Commit changes before updating? (Y/n): " reply
+    if [[ "$reply" =~ ^[Nn]$ ]]; then
+      echo "⚠ Cannot merge with uncommitted changes. Commit or stash them first."
+      return 1
+    fi
+    commit
+    if [[ $? -ne 0 ]]; then
+      echo "⚠ Commit failed. Aborting update."
+      return 1
+    fi
+  fi
+
+  echo "Fetching latest '$base_branch' from origin..."
+  git fetch origin "$base_branch:$base_branch" || {
+    echo "⚠ Could not fast-forward local '$base_branch'."
+    return 1
+  }
+
+  echo "Merging updated '$base_branch' into '$current_branch'..."
+  git merge --ff --no-edit "$base_branch"
+
+  if [[ $? -eq 0 ]]; then
+    echo "✓ '$current_branch' is now up-to-date with '$base_branch'."
+    
+    # Push if requested and merge was successful
+    if [[ "$should_push" == true ]]; then
+      # Check if remote has updates and pull first
+      git fetch origin "$current_branch" 2>/dev/null
+      local local_commit=$(git rev-parse HEAD)
+      local remote_commit=$(git rev-parse "origin/$current_branch" 2>/dev/null)
+      
+      if [[ -n "$remote_commit" && "$local_commit" != "$remote_commit" ]]; then
+        # Check if we're behind the remote
+        if git merge-base --is-ancestor "$local_commit" "$remote_commit" 2>/dev/null; then
+          echo "Remote has updates. Pulling first..."
+          git pull --rebase origin "$current_branch"
+          if [[ $? -ne 0 ]]; then
+            echo "⚠ Failed to pull remote changes. Please resolve conflicts and try again."
+            return 1
+          fi
+          echo "✓ Pulled latest changes."
+        elif ! git merge-base --is-ancestor "$remote_commit" "$local_commit" 2>/dev/null; then
+          # Branches have diverged
+          echo "Remote has diverged. Pulling with rebase..."
+          git pull --rebase origin "$current_branch"
+          if [[ $? -ne 0 ]]; then
+            echo "⚠ Failed to pull remote changes. Please resolve conflicts and try again."
+            return 1
+          fi
+          echo "✓ Rebased on latest changes."
+        fi
+      fi
+      
+      echo "Pushing '$current_branch' to origin..."
+      git push origin "$current_branch"
+      if [[ $? -eq 0 ]]; then
+        echo "✓ Successfully pushed '$current_branch' to origin."
+      else
+        echo "⚠ Failed to push '$current_branch' to origin."
+        return 1
+      fi
+    fi
+  else
+    echo "⚠ Merge completed with conflicts. Resolve them manually."
+
+    # Open merge tool for conflict resolution
+    if command -v "$merge_tool" >/dev/null 2>&1; then
+      "$merge_tool" .
+    fi
+  fi
+}

package/package.json

@@ -0,0 +1,42 @@
+{
+  "name": "gitbash",
+  "version": "0.1.0",
+  "description": "Opinionated git utilities for bash with fzf-powered menus",
+  "author": "jaggli",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jaggli/gitbash.git"
+  },
+  "homepage": "https://github.com/jaggli/gitbash#readme",
+  "bugs": {
+    "url": "https://github.com/jaggli/gitbash/issues"
+  },
+  "keywords": [
+    "bash",
+    "git",
+    "fzf",
+    "shell",
+    "utilities",
+    "cli",
+    "branch",
+    "commit",
+    "stash"
+  ],
+  "bin": {
+    "gitbash": "bin/gitbash"
+  },
+  "files": [
+    "bin/",
+    "commands/",
+    "README.md",
+    "LICENSE"
+  ],
+  "os": [
+    "darwin",
+    "linux"
+  ],
+  "engines": {
+    "node": ">=14"
+  }
+}