Fix git source lockfile instability #6786
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
deivid-rodriguez
force-pushed
the
fix-git-sources-stability
branch
2 times, most recently
from
56993a3
to
a1858ef
Compare
We have some flags that limit running git commit commands under certain situations, for example, when running under `--local`. However, those should only affect remote git operations, not local read-only operations like `git --version`, or `git rev-parse --abbrev-ref HEAD`. This commit refactors things to achieve that. By doing this, the `#to_s` representation of a source is more consistent, since we don't get any errors when reading the checked out branch, and we avoid some flip-flop lockfile issues.
deivid-rodriguez
force-pushed
the
fix-git-sources-stability
branch
from
a1858ef
to
4a529fc
Compare
deivid-rodriguez
changed the title
4 tasks
|
Added a test. Currently waiting for CI to finish. If CI is happy, I'll go ahead and merge it. |
deivid-rodriguez
pushed a commit
that referenced
this pull request
Jul 6, 2023
Fix git source lockfile instability (cherry picked from commit 163a104)
4 tasks
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.
What was the end-user or developer problem that led to this PR?
Sometimes Bundler may print inconsistent git source ordering to the lockfile.
What is your fix for the problem, implemented in this PR?
We have some flags that limit running git commands under certain situations, for example, when running under
--local. However, those should only affect remote git operations, not local read-only operations likegit --version, orgit rev-parse --abbrev-ref HEAD.This commit refactors things to achieve that.
By doing this, the
#to_srepresentation of a source is more consistent, since we don't get any errors when reading the checked out branch, and we avoid some flip-flop lockfile issues.Fixes #6743.
Make sure the following tasks are checked