carson 3.10.2 → 3.10.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/RELEASE.md +10 -0
- data/VERSION +1 -1
- data/lib/carson/runtime/deliver.rb +5 -3
- data/lib/carson/runtime/govern.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2bbb3e13e1c89593777ce820ddcf6ef96502693aaa1c2d41303e95cc374a46d9
|
|
4
|
+
data.tar.gz: 402e3a4b6152547e7b328c02686aeea4780a329cc61a187e75ec256de8355244
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d415ae9589a2a65587709a3adf079f112c5489890c68ffe42b295b23527dca980669e8433ec3a531f77628dd07099d7368d5c055817463627e5d9aa8710ec61a
|
|
7
|
+
data.tar.gz: 45d641154e946ee1f1f37e1d6b3a61971cab37c34433e6fd4ecbc6f44f0691b01268213f1664416061db5cedcf8f306b58698043667613f345005dd3f852050d
|
data/RELEASE.md
CHANGED
|
@@ -5,6 +5,16 @@ Release-note scope rule:
|
|
|
5
5
|
- `RELEASE.md` records only version deltas, breaking changes, and migration actions.
|
|
6
6
|
- Operational usage guides live in `MANUAL.md` and `API.md`.
|
|
7
7
|
|
|
8
|
+
## 3.10.3
|
|
9
|
+
|
|
10
|
+
### What changed
|
|
11
|
+
|
|
12
|
+
- **Drop `--delete-branch` from PR merge** — `carson deliver --merge` and `carson govern` no longer pass `--delete-branch` to `gh pr merge`. The flag causes `gh` to attempt switching the local checkout to `main` after deleting the branch, which always fails inside a worktree where `main` is already checked out in the main working tree. Branch cleanup is deferred to `carson prune`, which already handles this correctly.
|
|
13
|
+
|
|
14
|
+
### Migration
|
|
15
|
+
|
|
16
|
+
- No breaking changes. Merge behaviour is unchanged; only the post-merge local branch deletion attempt is removed.
|
|
17
|
+
|
|
8
18
|
## 3.10.2
|
|
9
19
|
|
|
10
20
|
### What changed
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
3.10.
|
|
1
|
+
3.10.3
|
|
@@ -256,14 +256,16 @@ module Carson
|
|
|
256
256
|
end
|
|
257
257
|
|
|
258
258
|
# Merges the PR using the configured merge method.
|
|
259
|
+
# Deliberately omits --delete-branch: gh tries to switch the local
|
|
260
|
+
# checkout to main afterwards, which fails inside a worktree where
|
|
261
|
+
# main is already checked out. Branch cleanup deferred to `carson prune`.
|
|
259
262
|
def merge_pr!( number:, result: )
|
|
260
263
|
method = config.govern_merge_method
|
|
261
264
|
result[ :merge_method ] = method
|
|
262
265
|
|
|
263
266
|
_, stderr, success, = gh_run(
|
|
264
267
|
"pr", "merge", number.to_s,
|
|
265
|
-
"--#{method}"
|
|
266
|
-
"--delete-branch"
|
|
268
|
+
"--#{method}"
|
|
267
269
|
)
|
|
268
270
|
|
|
269
271
|
if success
|
|
@@ -272,7 +274,7 @@ module Carson
|
|
|
272
274
|
error_text = stderr.to_s.strip
|
|
273
275
|
error_text = "merge failed" if error_text.empty?
|
|
274
276
|
result[ :error ] = error_text
|
|
275
|
-
result[ :recovery ] = "gh pr merge #{number} --#{method}
|
|
277
|
+
result[ :recovery ] = "gh pr merge #{number} --#{method}"
|
|
276
278
|
EXIT_ERROR
|
|
277
279
|
end
|
|
278
280
|
end
|
|
@@ -277,6 +277,7 @@ module Carson
|
|
|
277
277
|
end
|
|
278
278
|
|
|
279
279
|
# Merges a PR that has passed all gates.
|
|
280
|
+
# Omits --delete-branch (fails inside worktrees). Cleanup via `carson prune`.
|
|
280
281
|
def merge_if_ready!( pr:, repo_path: )
|
|
281
282
|
unless config.govern_auto_merge
|
|
282
283
|
puts_line " merge authority disabled; skipping merge"
|
|
@@ -288,7 +289,6 @@ module Carson
|
|
|
288
289
|
stdout_text, stderr_text, status = Open3.capture3(
|
|
289
290
|
"gh", "pr", "merge", number.to_s,
|
|
290
291
|
"--#{method}",
|
|
291
|
-
"--delete-branch",
|
|
292
292
|
chdir: repo_path
|
|
293
293
|
)
|
|
294
294
|
if status.success?
|