fix(git): peel annotated tags to commit in diff#182
Open
rocketman-code wants to merge 1 commit intomainfrom
Open
fix(git): peel annotated tags to commit in diff#182rocketman-code wants to merge 1 commit intomainfrom
rocketman-code wants to merge 1 commit intomainfrom
Conversation
When `chainsaw diff v1.0.0` is called and v1.0.0 is an annotated tag,
`resolve_ref_to_sha` returned the tag object SHA instead of the commit
SHA. `GitTreeVfs::new` then failed because it expects a commit object.
Append `^{commit}` to the rev-parse argument so annotated tags are
peeled to their underlying commit, matching the behaviour already
present in `classify_diff_arg`.
Closes #145
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.
Summary
chainsaw diff v1.0.0fails whenv1.0.0is an annotated tag becauseresolve_ref_to_shainsrc/vfs.rsreturns the tag object SHA, not the commit SHA^{commit}to therev-parse --verifyargument so annotated tags are peeled to their underlying commitclassify_diff_arginsrc/git.rsCloses #145
Test plan
cargo checkpassescargo testpasses (21/21)chainsaw diff <tag>