action_log: Accept deleted hunks after commit#56892
Merged
Merged
Conversation
e93d66f to
68b7b5e
Compare
benbrandt
approved these changes
May 15, 2026
This was referenced May 27, 2026
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.
Sometimes the action log would not auto-accept deleted hunks, and I finally found a repro for this, here's an explanation of what went wrong
The action log may track the deletion as:
fn keep() { work(); } -fn remove() { - work(); -} - fn after() { work(); }But the commit diff may choose different boundaries because nearby lines repeat:
fn keep() { work(); -} - -fn remove() { - work(); } fn after() { work(); }Both diffs produce the same final file, but their row ranges differ. The previous logic only accepted committed edits when those row ranges matched exactly, so already-committed edits could remain marked as unaccepted.
Now we have a fast path for checking if the base_text matches exactly, which works fine in this case.
Release Notes: