fix(stack): restore push summary and capture git push output#1614
Merged
Conversation
Contributor
Merge Protections🟢 All 5 merge protections satisfied — ready to merge. |
There was a problem hiding this comment.
Pull request overview
Restores stack push user-facing output parity by reintroducing the plan preview and per-PR outcome/orphan-deletion summaries, and reduces noisy git push narration by capturing its output and only surfacing stderr on failure.
Changes:
- Capture
git pushoutput inpush_branchesand include stderr only when the push fails. - Add a plan preview (including dry-run) and append per-PR outcome lines after upsert, plus orphan-deletion lines.
- Introduce plain-text change/orphan log formatters with unit tests.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 11 comments.
| File | Description |
|---|---|
crates/mergify-stack/src/notes_push.rs |
Capture git push output instead of inheriting stdio; include stderr on failure only. |
crates/mergify-stack/src/commands/push.rs |
Emit plan preview and restore post-upsert per-PR summary + orphan-deletion log lines. |
crates/mergify-stack/src/changes.rs |
Add plain-text log formatters for local/orphan changes and unit tests for expected output. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
bb98d3f to
d67e94f
Compare
Contributor
Author
Revision history
|
`stack push` rendered only `log_lines` and discarded the planned/upserted data, so the "Stacked pull request plan" preview and per-PR `[created] … <url>` summary were missing. Port `get_log_from_local_change` / `get_log_from_orphan_change` as plain-text formatters and emit the plan, created, and orphan-deleted lines into `log_lines` in flow order (dry-run included). `push_branches` ran `git push` with inherited stdio, leaking git's `remote:` ruleset-bypass and branch-creation narration. Capture it and surface stderr only on failure, matching `run_git_silent`. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Change-Id: Ic1a22ea2f054a6a38df6ff5aff569ae9573fce22
d67e94f to
6b9797e
Compare
jd
approved these changes
Jun 16, 2026
Contributor
Author
|
This pull request is part of a Mergify stack:
|
This was referenced Jun 16, 2026
remyduthu
approved these changes
Jun 17, 2026
Contributor
|
Queued — the merge queue status continues in this comment ↓. |
Contributor
Merge Queue Status
This pull request spent 6 minutes 12 seconds in the queue, including 5 minutes 44 seconds running CI. Required conditions to merge
|
36 tasks
38 tasks
mergify Bot
pushed a commit
that referenced
this pull request
Jun 17, 2026
The dry-run rebase narration and the revision-history change-type fetch warning carried literal `[orange]…[/]` Rich tags. Python rendered them through a markup-aware console (tags stripped off a TTY, styled on one); the Rust CLI prints log lines verbatim with no markup renderer, so users saw the literal bracket tags. Drop the tags so the lines read as plain text, consistent with the rest of the CLI's output. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Depends-On: #1614
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
stack pushrendered onlylog_linesand discarded the planned/upserted data, so the "Stacked pull request plan" preview and per-PR[created] … <url>summary were missing. Portget_log_from_local_change/get_log_from_orphan_changeas plain-text formatters and emit the plan, created, and orphan-deleted lines intolog_linesin flow order (dry-run included).push_branchesrangit pushwith inherited stdio, leaking git'sremote:ruleset-bypass and branch-creation narration. Capture it and surface stderr only on failure, matchingrun_git_silent.Co-Authored-By: Claude Opus 4.8 (1M context) noreply@anthropic.com