@neferbyte/cherry-release-cli 1.0.7 → 1.0.9

package/bin/cherry-release

@@ -140,13 +140,23 @@ COMMITS_production=""
 for branch in staging production; do
   hashes=$(git cherry "origin/$branch" origin/development | grep '^+' | awk '{print $2}')
 
-  # Filter out version bump commits (commit-and-tag-version)
+  # Filter out version bump commits and already-promoted commits
   filtered=""
   for hash in $hashes; do
-    msg=$(git log -1 --format="%s" "$hash")
-    if [[ ! "$msg" =~ ^chore\(release\): ]]; then
-      filtered="$filtered $hash"
+    subject=$(git log -1 --format="%s" "$hash")
+
+    # Skip version bump commits (commit-and-tag-version)
+    if [[ "$subject" =~ ^chore\(release\): ]]; then
+      continue
+    fi
+
+    # Skip commits whose subject already exists on the target branch
+    # (handles cases where git cherry misidentifies due to package.json/lockfile diffs)
+    if git log "origin/$branch" --format="%s" | grep -qFx "$subject"; then
+      continue
     fi
+
+    filtered="$filtered $hash"
   done
 
   eval "COMMITS_${branch}=\"${filtered# }\""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neferbyte/cherry-release-cli",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Cherry-pick commits across environment branches and tag releases",
   "license": "MIT",
   "bin": {
@@ -9,5 +9,8 @@
   },
   "files": [
     "bin/"
-  ]
+  ],
+  "peerDependencies": {
+    "commit-and-tag-version": ">=12.0.0"
+  }
 }