This repository was archived by the owner on Apr 14, 2021. It is now read-only.
when running from source, find submodule shas too#6737
Merged
3 commits merged intomasterfrom Oct 20, 2018
Merged
Conversation
We recently merged #6664 to prevent Bundler from (wrongly) claiming the git commit of any parent directory when it is run from source. However, Bundler is also run from source as a submodule in RubyGems, and in that case it does not have its own git directory. This commit resolves the failure in version_spec.rb that only appears when the Bundler tests are run from a submodule, by explicitly checking for that submodule, and using `git ls-tree` to get the sha if so. Arguably, this is a bugfix compared to the previous behavior, which would blindly print the current sha from the _RubyGems_ repo, while claiming that it was the sha of Bundler.
segiddins
reviewed
Oct 13, 2018
Member
|
What's status this and #6733? When they are merged |
Author
|
@bundlerbot r+ |
ghost
pushed a commit
that referenced
this pull request
Oct 20, 2018
6737: when running from source, find submodule shas too r=indirect a=indirect We recently merged #6664 to prevent Bundler from (wrongly) claiming the git commit of any parent directory when it is run from source. However, Bundler is also run from source as a submodule in RubyGems, and in that case it does not have its own git directory. This commit resolves the failure in version_spec.rb that only appears when the Bundler tests are run from a submodule, by explicitly checking for that submodule, and using `git ls-tree` to get the sha if so. Arguably, this is a bugfix compared to the previous behavior, which would blindly print the current sha from the _RubyGems_ repo, while claiming that it was the sha of Bundler. Co-authored-by: Andre Arko <andre@arko.net>
Author
Build succeeded |
ghost
pushed a commit
that referenced
this pull request
Oct 20, 2018
ghost
merged commit
ghost
pushed a commit
that referenced
this pull request
Oct 20, 2018
Member
|
@indirect Thanks a lot. I will prepare to release RG 2.7.8. |
This pull request was closed.
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 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.
We recently merged #6664 to prevent Bundler from (wrongly) claiming the
git commit of any parent directory when it is run from source. However,
Bundler is also run from source as a submodule in RubyGems, and in that
case it does not have its own git directory.
This commit resolves the failure in version_spec.rb that only appears
when the Bundler tests are run from a submodule, by explicitly checking
for that submodule, and using
git ls-treeto get the sha if so.Arguably, this is a bugfix compared to the previous behavior, which
would blindly print the current sha from the RubyGems repo, while
claiming that it was the sha of Bundler.