git-garbage 1.1.9 → 1.1.11

package/README.md

@@ -30,4 +30,4 @@ npm install --global git-garbage
 
 Authored and maintained by [Kiko Beats](https://kikobeats.com) with help from [contributors](https://github.com/Kikobeats/miconfig/contributors).
 
-> [kikobeats.com](https://kikobeats.com) · GitHub [Kiko Beats](https://github.com/Kikobeats) · Twitter [@Kikobeats](https://twitter.com/Kikobeats)
+> [kikobeats.com](https://kikobeats.com) · GitHub [Kiko Beats](https://github.com/Kikobeats) · X [@Kikobeats](https://x.com/Kikobeats)

package/garbage.sh

@@ -5,7 +5,7 @@ if test -n "$(git status --porcelain)"; then
   exit 1;
 fi
 
-if ! git fetch --quiet 2> /dev/null; then
+if ! git fetch --prune --quiet 2> /dev/null; then
   echo 'There was a problem fetching your branch.' >&2;
   exit 1;
 fi
@@ -15,15 +15,42 @@ current="$(git rev-parse --abbrev-ref HEAD)"
 declare -a branches
 
 # merged
-for branch in $(git for-each-ref --format "%(refname:short)" refs/heads/ --merged | grep -E -v "$current"); do
-  branches+=("$branch")
+for branch in $(git for-each-ref --format "%(refname:short)" refs/heads/ --merged); do
+  if [[ "$branch" != "$current" ]]; then
+    branches+=("$branch")
+  fi
 done
 
 # squashed
 for branch in $(git for-each-ref --format "%(refname:short)" refs/heads/); do
-  mergeBase=$(git merge-base "$current" "$branch")
-  if [[ $(git cherry "$current" "$(git commit-tree "$(git rev-parse "$branch^{tree}")" -p "$mergeBase" -m _)") == "-"* ]]; then
-    branches+=("$branch")
+  if [[ "$branch" != "$current" ]]; then
+    mergeBase=$(git merge-base "$current" "$branch")
+    if [[ $(git cherry "$current" "$(git commit-tree "$(git rev-parse "$branch^{tree}")" -p "$mergeBase" -m _)") == "-"* ]]; then
+      branches+=("$branch")
+    fi
+  fi
+done
+
+# branches that were part of PR workflow (feature branches with remote deleted)
+for branch in $(git for-each-ref --format "%(refname:short)" refs/heads/); do
+  if [[ "$branch" != "$current" ]]; then
+    # Check if branch has commits not in main (indicating it was a feature branch)
+    if [[ $(git rev-list --count "$current..$branch" 2>/dev/null) -gt 0 ]]; then
+      # Check if remote branch doesn't exist (indicating PR was closed and branch deleted)
+      if ! git show-ref --verify --quiet "refs/remotes/origin/$branch"; then
+        # Check if branch is already in our list to avoid duplicates
+        branch_exists=false
+        for existing_branch in "${branches[@]}"; do
+          if [[ "$existing_branch" == "$branch" ]]; then
+            branch_exists=true
+            break
+          fi
+        done
+        if [[ "$branch_exists" == false ]]; then
+          branches+=("$branch")
+        fi
+      fi
+    fi
   fi
 done
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "git-garbage",
   "description": "Delete local git branches after deleting them on the remote repository.",
   "homepage": "https://github.com/Kikobeats/git-garbage",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "bin": {
     "git-garbage": "garbage.sh"
   },
@@ -11,6 +11,7 @@
     "name": "Kiko Beats",
     "url": "https://github.com/Kikobeats"
   },
+  "contributors": [],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/kikobeats/git-garbage.git"
@@ -28,14 +29,12 @@
     "@commitlint/config-conventional": "latest",
     "@ksmithut/prettier-standard": "latest",
     "ci-publish": "latest",
-    "conventional-github-releaser": "latest",
     "finepack": "latest",
     "git-authors-cli": "latest",
+    "github-generate-release": "latest",
     "nano-staged": "latest",
-    "npm-check-updates": "latest",
     "simple-git-hooks": "latest",
     "standard": "latest",
-    "standard-markdown": "latest",
     "standard-version": "latest"
   },
   "files": [
@@ -44,28 +43,28 @@
   "scripts": {
     "contributors": "(npx git-authors-cli && npx finepack && git add package.json && git commit -m 'build: contributors' --no-verify) || true",
     "postrelease": "npm run release:tags && npm run release:github && (ci-publish || npm publish --access=public)",
-    "prerelease": "npm run update:check && npm run contributors",
+    "prerelease": "npm run contributors",
     "release": "standard-version -a",
-    "release:github": "conventional-github-releaser -p angular",
+    "release:github": "github-generate-release",
     "release:tags": "git push --follow-tags origin HEAD:master",
-    "test": "exit 0",
-    "update": "ncu -u",
-    "update:check": "ncu -- --error-level 2"
+    "test": "exit 0"
   },
   "license": "MIT",
   "commitlint": {
     "extends": [
       "@commitlint/config-conventional"
-    ]
+    ],
+    "rules": {
+      "body-max-line-length": [
+        0
+      ]
+    }
   },
   "nano-staged": {
     "*.js": [
       "prettier-standard",
       "standard --fix"
     ],
-    "*.md": [
-      "standard-markdown"
-    ],
     "package.json": [
       "finepack"
     ]