scrub: some left over fixes#31
Open
nothingmuch wants to merge 1 commit into
Open
Conversation
nothingmuch
force-pushed
the
minor-scrubber-fixes
branch
2 times, most recently
from
86b0c6d to
1cb7ced
Compare
arminsabouri
approved these changes
May 29, 2026
nothingmuch
force-pushed
the
minor-scrubber-fixes
branch
from
1cb7ced to
581553d
Compare
These fixes were in intermediate merge commits intended to be squashed into the PR that would have been merged after as it was rebased, and some things that slipped through the cracks. Remove conflict_skip map and per-commit skip check in check_one_commit, commits are filtered ahead of time. Remove some straggler /dev/null redirects
Collaborator
Author
|
incorrectly reverted section was restored, please re-review |
nothingmuch
force-pushed
the
minor-scrubber-fixes
branch
from
581553d to
25502e1
Compare
arminsabouri
approved these changes
Jun 1, 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
3 participants
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.
These fixes were in intermediate merge commits intended to be squashed into the PR that would have been merged after as it was rebased, and some things that slipped through the cracks.
Remove conflict_skip map and per-commit skip check in check_one_commit, commits are filtered ahead of time.
Move flake_ordered/quick_ordered construction before the conflict check.
Remove some straggler /dev/null redirects