| author |  Julius Marminge <julius0216@outlook.com> 2026-03-02 20:08:27-08:00 |
| committer |  Julius Marminge <jmarminge@gmail.com> 2026-03-02 20:46:05-08:00 |
| log | dcd2d50768363e61fdf556e81abada8aa54996de |
| tree | a64b3bc6819a23e15896d04b7cfb8d0a5b4e46e4 |
| parent | f11764c517732b1c02057f28ff1a10f03f8157da |
Keep non-default quick action on full PR flow
Co-authored-by: codex <codex@users.noreply.github.com>2 files changed, 4 insertions(+), 4 deletions(-)
apps
web
apps/web/src/components/GitActionsControl.logic.test.ts+3-3
| ... | ... | @@ -365,7 +365,7 @@ describe("when: working tree has local changes", () => { |
| 365 | 365 | }); |
| 366 | 366 | }); |
| 367 | 367 | |
| 368 | it("resolveQuickAction returns commit and push when open PR exists", () => { | |
| 368 | it("resolveQuickAction keeps full commit/push/pr flow on non-default branches even when PR exists", () => { | |
| 369 | 369 | const quick = resolveQuickAction( |
| 370 | 370 | status({ |
| 371 | 371 | hasWorkingTreeChanges: true, |
| ... | ... | @@ -382,8 +382,8 @@ describe("when: working tree has local changes", () => { |
| 382 | 382 | ); |
| 383 | 383 | assert.deepInclude(quick, { |
| 384 | 384 | kind: "run_action", |
| 385 | action: "commit_push", | |
| 386 | label: "Commit & push", | |
| 385 | action: "commit_push_pr", | |
| 386 | label: "Commit, push & create PR", | |
| 387 | 387 | }); |
| 388 | 388 | }); |
| 389 | 389 |
apps/web/src/components/GitActionsControl.logic.ts+1-1
| ... | ... | @@ -204,7 +204,7 @@ export function resolveQuickAction( |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | if (hasChanges) { |
| 207 | if (hasOpenPr || isDefaultBranch) { | |
| 207 | if (isDefaultBranch) { | |
| 208 | 208 | return { label: "Commit & push", disabled: false, kind: "run_action", action: "commit_push" }; |
| 209 | 209 | } |
| 210 | 210 | return { |