nix-prefetch-git: Fix git submodule checkout #552
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
The submodule may possibly already be initialized, thus lacking the initially expected dash (`-`).
|
👍 |
Otherwise, the first '.' might match the first character of the hash, if the submodule status line starts with just a space (which may get lost in the bash variable processing).
|
I ran into an issue today where the complete commit hash was needed. As the skipped character may not be just white space (it may get trimmed off by bash), I constrained the skipping to just the expected non-hash characters. Hope it still works for you! |
|
I have tested this PR, too, and it seems to be working properly, thanks! |
|
With all due respect to this solution from @joranvar, I have just submitted #570 which is a superset of this PR, fixing some other issues in nix-prefetch-get by taking a bit of a different approach. I would appreciate confirmation from anyone that tested this PR (#552) that #570 also resolves the issues they encountered. Thanks! |
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.
When fetching git submodules, nix-prefetch-git would fail on line 160 with "cd: too many arguments". I'm not sure if the
git submodule statusoutput has changed, or whether init_submodules() is called in different situations where it does work. But this change works for me (the submodule is checked out correctly), so it may benefit someone else as well.Separate git submodule dir from
git describepart when parsingIgnore first character of
git submodule statusoutputThe submodule may possibly already be initialized, thus lacking the
initially expected dash (
-).