Fixes for annotated Git tags #6251
Merged
Conversation
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
tonistiigi
force-pushed
the
git-annotated-fix2
branch
2 times, most recently
from
94cec13 to
aa0f42c
Compare
jsternberg
approved these changes
Sep 30, 2025
Pin of annotated tag should be tha SHA of tag, not the commit it is pointing to. Cache key of annotated tag should be SHA of the tag if keep-git-dir is enabled and SHA of underlying commit otherwise. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
tonistiigi
force-pushed
the
git-annotated-fix2
branch
from
aa0f42c to
02c557f
Compare
This is more flexible as from the user standpoint it might not be easy to know if a version tag is annotated or not. Downside of this change is that we can't create a cache key automatically when checksum was set and no keep-git-dir as we don't know which checksum is being used. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
tonistiigi
force-pushed
the
git-annotated-fix2
branch
from
02c557f to
80c6fb9
Compare
Member
Author
|
Needed to change some expected values in dockerfile test. These were related to how the previous implementation matched the cache based on the checksum. Afaics, it is more correct now, but a bit slower in some cases. |
AkihiroSuda
approved these changes
Oct 1, 2025
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.
based on #6244
git: fix annotated tag pinning and cache keys
Pin of annotated tag should be tha SHA of tag, not
the commit it is pointing to.
Cache key of annotated tag should be SHA of the tag
if keep-git-dir is enabled and SHA of underlying
commit otherwise.
git: allow checksum of annotated tag ref match either tag or commit sha
This is more flexible as from the user standpoint it might not
be easy to know if a version tag is annotated or not.
Downside of this change is that we can't create a cache key
automatically when checksum was set and no keep-git-dir as we
don't know which checksum is being used.
Signed-off-by: Tonis Tiigi tonistiigi@gmail.com