Explicitly checkout submodules when needed #58
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
|
<3 thanks @gfontenot! Could you slap a quick changelog entry on this? We should backport & release it as 1.0.1 |
|
Added the changelog entry by ammending the previous commit. |
| `--depth=1` under git 2.9. | ||
| [Gordon Fontenot](https://github.com/gfontenot) | ||
| [#58](https://github.com/CocoaPods/cocoapods-downloader/pull/58) | ||
| [CocoaPods#5555]()https://github.com/CocoaPods/CocoaPods/issues/5555) |
There was a problem hiding this comment.
Oops, good catch. Fixed.
After doing some research, it looks like git 2.9 made a change so that command line flags are now sent to the submodule commands as well, where pre-2.9 releases ignored those flags for submodules. That seems like a great change on the surface. But unfortunately for us, it means that using `--depth=1` and `--recursive` in the same command will almost always result in a failed clone. This is because the submodule is also initially checked out using `--depth=1` and so when it then tries to check out the commit specified by the .gitmodules file, it fails because it doesn't see that SHA in the git history. The only way it will succeed is if the specified commit also happens to be the HEAD of master. This issue can be fixed by removing the `--recursive` flag from the initial git command, and then running `git submodules --init --recursive` inside the repo to pull down the submodules.
|
Fixed this up by using an actual git command, as opposed to one my dumb brain decided to make up. |
|
@segiddins Any idea about a timeframe for getting a release with this? I'm happy to help however I can, I'm blocked locally by it. |
|
@gfontenot I can try and get around to it today but no promises, in the meantime see https://guides.cocoapods.org/using/unreleased-features.html |
1 task
segiddins
added a commit
that referenced
this pull request
Jun 24, 2016
Explicitly checkout submodules when needed (cherry picked from commit a378ad7)
|
Released |
|
🎉 Thanks @segiddins! |
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.
After doing some research, it looks like git 2.9 made a change so that command
line flags are now sent to the submodule commands as well, where pre-2.9
releases ignored those flags for submodules.
That seems like a great change on the surface. But unfortunately for us, it
means that using
--depth=1and--recursivein the same command will almostalways result in a failed clone. This is because the submodule is also
initially checked out using
--depth=1and so when it then tries to check outthe commit specified by the .gitmodules file, it fails because it doesn't see
that SHA in the git history. The only way it will succeed is if the specified
commit also happens to be the HEAD of master.
This issue can be fixed by removing the
--recursiveflag from the initialgit command, and then running
git submodules --init --recursiveinside therepo to pull down the submodules.
Fixes CocoaPods/CocoaPods#5555