carson 3.13.0 → 3.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d653b3c6ec67aa729186db46215c6e51c85a42ac82ca782f5004f9d84e32a31
-  data.tar.gz: 5caa70de1a5c9538c3ef3027ba0862445c9ff2d985ec6f4659231bb40d8e5cb7
+  metadata.gz: bb773d053eb0271bf5b1997349eaf9afa972ad5ba8612a3930764e2ace68592d
+  data.tar.gz: 957745cc1c1f0ee91e2a58062e6730b4ff09f3c78e7c7178f7d7d602ac74b858
 SHA512:
-  metadata.gz: 91bd6ee521d91f31c3593558e1b544fcba99eefd1d084fb8c618fad428c470d308ed774e7655b31be9d0fc35969bd9d5354832d5002042396e3d48b8ffde77b2
-  data.tar.gz: 10758df9aeb5d246211592671eb19c59156cbd9fd7cb5d6e31e32186ee36d1caef8fe3dc7c785bdbfbac4e1339ee8d56bf445556a6722395f8eb42a2bfdabe12
+  metadata.gz: f547c3aa8645e9da8877c24e645dad85896cd3640890f9da2c6d35cd5557fe0fcd784e3dd75a74910d677544be2294aace0720bd6267e56f1fb7e99c3abe094b
+  data.tar.gz: 01a7ec9498cae31c12e1f68a3498381ad8f7bb5a229de5b2e833c410b06cca4759abd426583b39c766b931d1e829c3fae1cb9272d12b60ea52e59328296bb287

data/RELEASE.md

@@ -5,6 +5,12 @@ Release-note scope rule:
 - `RELEASE.md` records only version deltas, breaking changes, and migration actions.
 - Operational usage guides live in `MANUAL.md` and `API.md`.
 
+## 3.13.1
+
+### What changed
+
+- **Content-aware unpushed-commits guard** — `carson worktree remove` no longer falsely blocks after squash or rebase merges. Previously it compared commit SHAs, which differ after squash merge even though the content is on main. Now it compares tree content via `git diff --quiet`: if the branch's content matches main, the work is already merged and removal proceeds without `--force`.
+
 ## 3.13.0
 
 ### What changed

data/VERSION

@@ -1 +1 @@
-3.13.0
+3.13.1

data/lib/carson/runtime/local/worktree.rb

@@ -220,6 +220,7 @@ module Carson
 			end
 
 			# Checks whether a branch has unpushed commits that would be lost on removal.
+			# Content-aware: after squash/rebase merge, SHAs differ but tree content may match main. Compares content, not SHAs.
 			# Returns nil if safe, or { error:, recovery: } hash if unpushed work exists.
 			def check_unpushed_commits( branch:, worktree_path: )
 				return nil unless branch
@@ -231,8 +232,16 @@ module Carson
 					# Remote ref does not exist. Only block if the branch has unique commits vs main.
 					unique, _, unique_status, = Open3.capture3( "git", "rev-list", "--count", "#{config.main_branch}..#{branch}", chdir: worktree_path )
 					if unique_status.success? && unique.strip.to_i > 0
-						return { error: "branch has not been pushed to #{remote}",
-							recovery: "git -C #{worktree_path} push -u #{remote} #{branch}, or use --force to override" }
+						# Content-aware check: after squash/rebase merge, commit SHAs differ
+						# but the tree content may be identical to main. Compare content,
+						# not SHAs — if the diff is empty, the work is already on main.
+						diff_out, _, diff_ok, = Open3.capture3( "git", "diff", "--quiet", config.main_branch, branch, chdir: worktree_path )
+						unless diff_ok.success?
+							return { error: "branch has not been pushed to #{remote}",
+								recovery: "git -C #{worktree_path} push -u #{remote} #{branch}, or use --force to override" }
+						end
+						# Diff is empty — content is on main (squash/rebase merged). Safe.
+						puts_verbose "branch #{branch} content matches main — squash/rebase merged, safe to remove"
 					end
 				elsif ahead.strip.to_i > 0
 					return { error: "worktree has unpushed commits",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carson
 version: !ruby/object:Gem::Version
-  version: 3.13.0
+  version: 3.13.1
 platform: ruby
 authors:
 - Hailei Wang