fix: use OID instead of change ID in rewrite_commit_messages#95
Open
segfault-magnet wants to merge 1 commit intoLucioFranco:mainfrom
Open
fix: use OID instead of change ID in rewrite_commit_messages#95segfault-magnet wants to merge 1 commit intoLucioFranco:mainfrom
segfault-magnet wants to merge 1 commit intoLucioFranco:mainfrom
Conversation
segfault-magnet
force-pushed
the
fix-divergent-oid
branch
from
64390c2 to
b412a12
Compare
Change IDs can be divergent (e.g. when a collaborator bases work on your stack without updating it), causing `jj describe` to reject the ambiguous target. Using the git commit OID directly avoids this. Since OIDs are unstable across rebases — and `jj describe` rebases all descendants, giving them new OIDs — we reverse the iteration order to top-to-bottom. The topmost commit has no descendants, and each subsequent describe only rebases already-processed commits whose messages are preserved through rebase.
segfault-magnet
force-pushed
the
fix-divergent-oid
branch
from
b412a12 to
0cf1756
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
1 participant
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.
Closes: #94
Change IDs can be divergent (e.g. when a collaborator bases work on your stack without updating it), causing
jj describeto reject the ambiguous target. Using the git commit OID directly avoids this.Since OIDs are unstable across rebases — and
jj describerebases all descendants, giving them new OIDs — we reverse the iteration order to top-to-bottom. The topmost commit has no descendants, and each subsequent describe only rebases already-processed commits whose messages are preserved through rebase.