Repository navigation
git: fix potential difference between cache and snapshot - #6281
Merged
Merged
Conversation
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
tonistiigi
force-pushed
the
git-cache-snapshot-check
branch
from
October 9, 2025 03:07
0b7f47a to
9576254
Compare
crazy-max
approved these changes
Oct 13, 2025
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.
If content changes in the upstream Git repository, there is a theoretical race between computing the cache key for ref(based on commit SHA) and actually checking out that ref. If commit changes in between these operations then the content may be cached by wrong commit SHA and wrong commit SHA can also end up in the provenance attestation.
This fix detects this case. If the original commit from the cache computation is still available in upstream then that commit is used instead (it is not the correct commit anymore but it was in the start of the build so it can still be trusted). If upstream has removed the commit, then the build fails and needs to be restarted.