Skip to content

Treat orphan fixup commits as normal stacks and preserve review status with whitespace-sensitive patch IDs - #12

Merged
nnutter merged 2 commits into
masterfrom
bad-fixup
Oct 15, 2026
Merged

nnutter merged 2 commits into
masterfrom
bad-fixup

Conversation

@nnutter

@nnutter nnutter commented Oct 15, 2026

Copy link
Copy Markdown
Owner

No description provided.

A stray fixup!/amend!/reword! subject aborts the whole snapshot,
so one misplaced commit blocks review of the entire branch.
Fall back to a standalone stack when no single adjacent target
exists, with regression coverage for orphan feedback commits.
Hashing raw diffs invalidates approval when an earlier change shifts a
hunk or changes a touched file's blob identity, even if the reviewed
change stays the same. Use Git's verbatim patch IDs to ignore those
incidental differences without ignoring significant whitespace such as
Python indentation.

Version the new hashes separately from the previous SHA-256 format.
Existing records remain readable and retain exact-scope status, but old
hashes cannot transfer approval to rewritten stacks under the new rule.
@nnutter
nnutter enabled auto-merge October 15, 2026 14:45
@nnutter
nnutter disabled auto-merge October 15, 2026 14:46
@nnutter
nnutter merged commit d40f098 into master Oct 15, 2026
1 check passed
@nnutter
nnutter deleted the bad-fixup branch October 15, 2026 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant