fix(stack): carry the revision note onto the rewritten commit

[JulianMaurin]

A note is addressed by commit SHA, so every rewrite stranded it. The
rebase stack push runs before it reads notes back left the reason on
the pre-rebase SHA, and the revision history recorded a blank Reason;
a plain git commit --amend lost it the same way.

stack setup now adds a local notes.rewriteRef, which is what covers
the rewrites git runs on its own — git commit --amend, and the
git rebase --continue that finishes a conflicted rebase. The CLI's own
rebases pass the same settings with -c so they stay correct in
checkouts whose config predates this, and so a global
notes.rewriteMode=ignore cannot disable the copy. Existing checkouts
pick the config up on their next mergify stack setup.

Co-Authored-By: Claude Opus 4.8 noreply@anthropic.com

[JulianMaurin]

This pull request is part of a Mergify stack:

#	Pull Request	Link
1	fix(stack): carry the revision note onto the rewritten commit	#1729	👈
2	fix(stack): refuse an amend at a rebase conflict pause	#1730
3	docs(stack): record what a stack push rebases away in the skill	#1724

[mergify]

Merge Protections

🟢 All 6 merge protections satisfied — ready to merge.

Show 6 satisfied protections

🟢 🤖 Continuous Integration

• all of:
  • check-success=ci-gate

🟢 👀 Review Requirements

• any of:
  • #approved-reviews-by>=2
  • author = dependabot[bot]
  • author = mergify-ci-bot
  • author = renovate[bot]

🟢 Enforce conventional commit

Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/

• title ~= ^(fix|feat|internal|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?!?:

🟢 🔎 Reviews

• #changes-requested-reviews-by = 0
• #review-requested = 0
• #review-threads-unresolved = 0

🟢 📕 PR description

• body ~= (?ms:.{48,})

🟢 🚦 Auto-queue

When all merge protections are satisfied, this pull request will be queued automatically.

[JulianMaurin]

Revision history

#	Type	Changes	Reason	Date
1	initial	898bb48		2026-07-20 14:36 UTC
2	content	898bb48 → 4c82e38 (raw)		2026-07-20 14:36 UTC
3	content	4c82e38 → 39b4faa (raw)	Copilot review: correct the notes_rewrite_config doc (setup persists only notes.rewriteRef), narrow it to pub(crate), and document notes.rewriteRef on InstallOutcome.	2026-07-20 15:20 UTC

[Copilot]

Pull request overview

This PR fixes stack note/revision-note loss across rewritten commits by ensuring Git notes under the stack notes ref are copied forward during rebases and other rewrite operations. It does so by persisting notes.rewriteRef in the local repo config via stack setup, and by pinning rewrite behavior via per-invocation git -c ... overrides for the CLI-driven rebases/pulls.

Changes:

• Add a reusable git -c config bundle to force notes rewrite behavior during CLI-driven rebases.
• Ensure stack sync’s git pull --rebase path also carries the notes rewrite config.
• Extend stack setup to add notes.rewriteRef=refs/notes/mergify/stack to local git config and surface that outcome in CLI output, with regression tests.

Reviewed changes

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

File	Description
crates/mergify-stack/src/git.rs	Adds notes-rewrite -c overrides to scripted rebases and a regression test to ensure stack notes survive rewrites.
crates/mergify-stack/src/commands/sync.rs	Applies the notes-rewrite config to the pull --rebase fast-path so notes are preserved there too.
crates/mergify-stack/src/commands/setup.rs	Persists notes.rewriteRef in local repo config (for out-of-process rewrites like commit --amend) and adds an idempotency test.
crates/mergify-cli/src/main.rs	Prints a confirmation when stack setup adds the new notes.rewriteRef config.

---

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

[mergify]

Merge Queue Status

• ✅ Entered queue — 2026-07-21 07:36 UTC · Rule: default · triggered by merge protections
• ✅ Checks passed · on draft merge queue: checking main (a1d41dd) and #1729 together #1734
• ✅ Merged — 2026-07-21 07:42 UTC · at 39b4faadfb658226cadd3964909d8852cbe86b92 · squash

This pull request spent 6 minutes 32 seconds in the queue, including 6 minutes 13 seconds running CI.

Required conditions to merge

• github-review-approved [🛡 GitHub branch protection] (documentation)
  • fix(stack): carry the revision note onto the rewritten commit #1729
• github-review-approved [🛡 GitHub repository ruleset rule Require pull request for default branch] (documentation)
  • fix(stack): carry the revision note onto the rewritten commit #1729
• all of [🛡 Merge Protections rule Enforce conventional commit]:
  • title ~= ^(fix|feat|internal|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?!?:
    • fix(stack): carry the revision note onto the rewritten commit #1729
• all of [🛡 Merge Protections rule 👀 Review Requirements]:
  • any of:
    • #approved-reviews-by>=2
      • fix(stack): carry the revision note onto the rewritten commit #1729
    • author = dependabot[bot]
      • fix(stack): carry the revision note onto the rewritten commit #1729
    • author = mergify-ci-bot
      • fix(stack): carry the revision note onto the rewritten commit #1729
    • author = renovate[bot]
      • fix(stack): carry the revision note onto the rewritten commit #1729
• all of [🛡 Merge Protections rule 📕 PR description]:
  • body ~= (?ms:.{48,})
    • fix(stack): carry the revision note onto the rewritten commit #1729
• all of [🛡 Merge Protections rule 🔎 Reviews]:
  • #changes-requested-reviews-by = 0
    • fix(stack): carry the revision note onto the rewritten commit #1729
  • #review-requested = 0
    • fix(stack): carry the revision note onto the rewritten commit #1729
  • #review-threads-unresolved = 0
    • fix(stack): carry the revision note onto the rewritten commit #1729
• all of [🛡 Merge Protections rule 🤖 Continuous Integration]:
  • all of:
    • check-success=ci-gate