feat(stack): add mergify stack reword command by jd · Pull Request #1384 · Mergifyio/mergify-cli

jd · 2026-05-07T13:56:10Z

Add "mergify stack reword COMMIT [-m MESSAGE]" which changes a single
commit's message non-interactively, replacing the manual
"GIT_SEQUENCE_EDITOR='sed -i ... pick → reword' git rebase -i" recipe.

With -m, the rebase keeps COMMIT as pick and inserts an exec git commit --amend -F <tmpfile> line right after it — the amend runs while
HEAD still points at the target, so prepare-commit-msg re-attaches the
Change-Id via the existing hook. Multi-line messages are passed via the
temp file rather than -m "...", so they survive embedding into a
single rebase-todo line. Without -m, COMMIT is marked as reword so
git stops and opens $GIT_EDITOR for that commit only — convenient in a
TTY, but it will hang in agent contexts (pass -m to stay non-interactive).

Errors when COMMIT prefix is unknown. Supports --dry-run.

Also documents the reword command in skills/mergify-stack/SKILL.md.

mergify · 2026-05-07T13:56:23Z

Copilot

Pull request overview

Adds a new mergify stack reword command to change a single commit message (either non-interactively via -m/--message or interactively via $GIT_EDITOR) by driving an interactive rebase under the hood, and documents the workflow in the stack skill guide.

Changes:

Introduces mergify stack reword COMMIT [-m MESSAGE] [--dry-run] CLI command.
Implements the reword logic using run_action_rebase() with either reword or an injected exec git commit --amend -F <file> step.
Adds a dedicated pytest suite covering SHA/Change-Id targeting, multiline messages, dry-run, and empty-stack behavior; updates stack documentation.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.

File	Description
skills/mergify-stack/SKILL.md	Documents the new `stack reword` command and recommended usage.
mergify_cli/tests/stack/test_reword.py	Adds tests validating the new reword behavior (including multiline and Change-Id targeting).
mergify_cli/stack/reword.py	Implements the `stack_reword()` operation, including the `exec ... --amend -F` non-interactive path.
mergify_cli/stack/cli.py	Wires the new `reword` subcommand into the `stack` CLI group.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

jd · 2026-05-07T15:34:57Z

Revision history

#	Type	Changes	Reason	Date
1	initial	`1b124e6`		2026-05-07 15:34 UTC
2	content	`1b124e6 → a2174ce` (raw)	address copilot review: drop the finally that nukes the temp message file on rebase conflict (so git rebase --continue can still read it), and align the displayed action plan with the rebase action a…	2026-05-07 15:34 UTC
3	content	`a2174ce → 09642ac` (raw)	tweak comment wording: '/tmp' → 'system temp directory' (tempfile.mkstemp honours $TMPDIR; matches the same wording fix in #1386 squash.py)	2026-05-08 14:24 UTC

…icts `stack_squash` with `-m` writes the new commit message to a temp file and inserts an `exec git commit --amend -F <tmpfile>` line in the rebase todo. The previous code wrapped the rebase in `try/finally` so the temp file was unlinked even when the rebase failed mid-way (e.g. conflicts on a fixup line that runs before the exec). After the user resolved conflicts and ran `git rebase --continue`, git would replay the exec line and fail because the message file no longer existed. Drop the `finally`; only unlink on the success path. If the rebase raises SystemExit, the file persists so `--continue` can still execute the amend. The temp file lives in `/tmp` and gets cleaned by the OS. Same pattern (and same fix) as `stack_reword` — flagged by Copilot on Change-Id: Ia026b5b631ed043a03983beec5ca81fd29f77633 #1384 review.

Add "mergify stack reword COMMIT [-m MESSAGE]" which changes a single commit's message non-interactively, replacing the manual "GIT_SEQUENCE_EDITOR='sed -i ... pick → reword' git rebase -i" recipe. With -m, the rebase keeps COMMIT as `pick` and inserts an `exec git commit --amend -F <tmpfile>` line right after it — the amend runs while HEAD still points at the target, so prepare-commit-msg re-attaches the Change-Id via the existing hook. Multi-line messages are passed via the temp file rather than `-m "..."`, so they survive embedding into a single rebase-todo line. Without -m, COMMIT is marked as `reword` so git stops and opens $GIT_EDITOR for that commit only — convenient in a TTY, but it will hang in agent contexts (pass -m to stay non-interactive). Errors when COMMIT prefix is unknown. Supports --dry-run. Also documents the reword command in skills/mergify-stack/SKILL.md. Change-Id: Ic8d3c0b7f74501fc3eecb5bafe4b3922af697f40

mergify · 2026-05-11T08:36:00Z

…icts (#1386) `stack_squash` with `-m` writes the new commit message to a temp file and inserts an `exec git commit --amend -F <tmpfile>` line in the rebase todo. The previous code wrapped the rebase in `try/finally` so the temp file was unlinked even when the rebase failed mid-way (e.g. conflicts on a fixup line that runs before the exec). After the user resolved conflicts and ran `git rebase --continue`, git would replay the exec line and fail because the message file no longer existed. Drop the `finally`; only unlink on the success path. If the rebase raises SystemExit, the file persists so `--continue` can still execute the amend. The temp file lives in `/tmp` and gets cleaned by the OS. Same pattern (and same fix) as `stack_reword` — flagged by Copilot on #1384 review.

Copilot AI review requested due to automatic review settings May 7, 2026 13:56

mergify Bot had a problem deploying to Mergify Merge Protections May 7, 2026 13:56 Failure

jd temporarily deployed to func-tests-live May 7, 2026 13:56 — with GitHub Actions Inactive

Copilot started reviewing on behalf of jd May 7, 2026 13:57 View session

Copilot AI reviewed May 7, 2026

View reviewed changes

Comment thread mergify_cli/stack/reword.py Outdated

Comment thread mergify_cli/stack/reword.py Outdated

mergify Bot added the review threads unresolved label May 7, 2026

mergify Bot requested a review from a team May 7, 2026 14:11

jd marked this pull request as ready for review May 7, 2026 15:00

jd force-pushed the devs/jd/feat/stack-reword/add-mergify-stack-reword-cmd--c8d3c0b7 branch from 1b124e6 to a2174ce Compare May 7, 2026 15:34

jd temporarily deployed to func-tests-live May 7, 2026 15:35 — with GitHub Actions Inactive

mergify Bot had a problem deploying to Mergify Merge Protections May 7, 2026 15:35 Failure

jd temporarily deployed to func-tests-live May 7, 2026 15:35 — with GitHub Actions Inactive

mergify Bot removed the review threads unresolved label May 7, 2026

jd mentioned this pull request May 7, 2026

fix(stack): keep squash --message temp file alive across rebase conflicts #1386

Merged

jd force-pushed the devs/jd/feat/stack-reword/add-mergify-stack-reword-cmd--c8d3c0b7 branch from a2174ce to 09642ac Compare May 8, 2026 14:24

jd temporarily deployed to func-tests-live May 8, 2026 14:24 — with GitHub Actions Inactive

mergify Bot deployed to Mergify Merge Protections May 8, 2026 14:24 Active

JulianMaurin approved these changes May 11, 2026

View reviewed changes

mergify Bot requested a review from a team May 11, 2026 08:28

kozlek approved these changes May 11, 2026

View reviewed changes

mergify Bot added a commit that referenced this pull request May 11, 2026

Merge of #1384

9331980

mergify Bot added the queued label May 11, 2026

mergify Bot mentioned this pull request May 11, 2026

merge queue: embarking main (25c2d4f), #1386 and #1384 together #1401

Closed

36 tasks

mergify Bot merged commit 301ae09 into main May 11, 2026
19 checks passed

mergify Bot deleted the devs/jd/feat/stack-reword/add-mergify-stack-reword-cmd--c8d3c0b7 branch May 11, 2026 08:50

mergify Bot removed the queued label May 11, 2026

This was referenced May 11, 2026

feat(stack): add mergify stack drop command #1383

Open

docs(skill): document mergify stack edit for mid-stack amends #1385

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(stack): add mergify stack reword command#1384

feat(stack): add mergify stack reword command#1384
mergify[bot] merged 1 commit intomainfrom
devs/jd/feat/stack-reword/add-mergify-stack-reword-cmd--c8d3c0b7

jd commented May 7, 2026

Uh oh!

mergify Bot commented May 7, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

jd commented May 7, 2026 •

edited

Loading

Uh oh!

mergify Bot commented May 11, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

Conversation

jd commented May 7, 2026

Uh oh!

mergify Bot commented May 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge Protections

🟢 🤖 Continuous Integration

🟢 👀 Review Requirements

🟢 Enforce conventional commit

🟢 🔎 Reviews

🟢 📕 PR description

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

jd commented May 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Revision history

Uh oh!

mergify Bot commented May 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge Queue Status

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

mergify Bot commented May 7, 2026 •

edited

Loading

jd commented May 7, 2026 •

edited

Loading

mergify Bot commented May 11, 2026 •

edited

Loading