git: fix caching git commit through multiple refs #5444
Merged
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
tonistiigi
force-pushed
the
git-cachekey-fix
branch
from
b2285f0 to
6f499a6
Compare
crazy-max
approved these changes
Oct 23, 2024
jedevc
approved these changes
Oct 23, 2024
|
I think this goes someway towards fixing #4446 (comment)? Not fully, since we're still in a detached-head state, but someway, since at least now we've consistently got the right refs in |
tonistiigi
force-pushed
the
git-cachekey-fix
branch
from
6f499a6 to
26ac486
Compare
This fixes current issue when a Git commit is accessed multiple times through different refs or ref is added after commit has already been pulled once. When keep-git-dir option is true, then program can try to resolve the current reference via .git directory and because old cache key was only the git commit, previous .git directory can be reused without any refs inside. There is no change to the behavior if keep-git-dir is false as then requests through multiple refs yield to identical content. Only the reference in the user provided identifier is added to the cache key, and that is the only one that can be expected in .git because of the shallow fetches. We do not do extra request to find named refs for a commit SHA if that is provided in the identifier. Signed-off-by: Tonis Tiigi <[email protected]>
tonistiigi
force-pushed
the
git-cachekey-fix
branch
from
26ac486 to
44b1aca
Compare
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.
This fixes a current issue when a Git commit is accessed multiple times through different refs, or a ref is added after the commit has already been pulled once.
When keep-git-dir option is true, then program can try to resolve the current reference via .git directory and because old cache key was only the git commit, previous .git directory can be reused without any refs inside.
There is no change to the behavior if keep-git-dir is false, as then requests through multiple refs yield identical content.
Only the reference in the user-provided identifier is added to the cache key, and that is the only one that can be expected in .git because of the shallow fetches. We do not do extra request to find named refs for a commit SHA if that is provided in the identifier.
This change can break old cache for existing keep-git-dir clones.