Fix lookup of tags in the presence of lightweight tags #1029
Conversation
This file contains 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
- Add GitRepositoryTests.TryGetObjectByShaAndWrongTypeTest, which fails because of the exception thrown in TryGetObjectByPath (Nerdbank.GitVersioning.GitException : Got a comm instead of a tree when opening object d13d221382b251e13f23d0e32062bb2354d2c340) - Extend VersionOracleTests.Tags to add another commit and check that the new commit does not point to the tag. This fails for the lightweight tag case because we enter the TryGetObjectBySha(pointsAt, "tag", ...) path which tries to retrieve the tag object assuming it is of type "tag" when in fact it is of type "commit", and throws the exception. The reason it doesn't fail without the extension to the test (i.e. when the lightweight tag points to HEAD) is that the objectId.Equals(pointsAt) check passes (for the same reason: the tag "is" the commit) so the TryGetObjectBySha path is not entered. That's also why there is no additional fix needed for lightweight tags in HandleCandidate: its purpose is to decide whether a tag points to the given object. For lightweight tags it's a simple equality check on the object ids. It's only for annotated tags where we need to dig in to find the actual commit id. - Extend VersionOracleTests.Tags_Annotated for symmetry. It still passes either way.
Rob-Hague
commented
Feb 3, 2024
|
Thanks a lot! |
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.
Fixes #1026
I've not validated this against my problematic repo (I'm not sure how), but I think I've worked out a decent enough understanding of the problem to be confident that this will fix it.