Repository navigation
Replace patch-id rebase detection with merge-tree comparison - #246
Merged
Merged
Conversation
Collaborator
Author
|
Reviews in this chain: |
Collaborator
Author
|
jerry-skydio
force-pushed
the
jerry/revup/main/patchidtree
branch
from
May 11, 2026 21:21
123edbe to
0253b88
Compare
This was referenced May 11, 2026
jerry-skydio
force-pushed
the
jerry/revup/main/evenmoretests
branch
from
May 19, 2026 01:44
2f428c7 to
b1104d7
Compare
jerry-skydio
force-pushed
the
jerry/revup/main/patchidtree
branch
from
May 19, 2026 01:44
0253b88 to
6dc613e
Compare
jerry-skydio
force-pushed
the
jerry/revup/main/evenmoretests
branch
from
May 19, 2026 01:51
b1104d7 to
8686667
Compare
jerry-skydio
force-pushed
the
jerry/revup/main/patchidtree
branch
from
May 19, 2026 01:51
6dc613e to
162c8ba
Compare
matt-wagantall-skydio
approved these changes
May 19, 2026
Patch-id can produce false matches on large blocks of repeated text. Instead, apply each local commit onto the remote commit's parent via merge-tree and compare the resulting tree to the remote tree. This also fixes a long standing corner case where a change could be marked non-rebase even though applying that commit would result in the same thing. This was because diffs that are already applied are accepted as no-ops, but still affect the patch id. Fixes: #182 Fixes: #174
jerry-skydio
force-pushed
the
jerry/revup/main/patchidtree
branch
from
May 19, 2026 01:53
162c8ba to
cfc0a80
Compare
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.
Patch-id can produce false matches on large blocks of repeated text.
Instead, apply each local commit onto the remote commit's parent via
merge-tree and compare the resulting tree to the remote tree.
This also fixes a long standing corner case where a change could be
marked non-rebase even though applying that commit would result in the
same thing. This was because diffs that are already applied are accepted
as no-ops, but still affect the patch id.
Fixes: #182
Fixes: #174