submodule: catch when submodule is not staged on update#4161
Merged
ethomson merged 1 commit intolibgit2:masterlibgit2/libgit2:masterfrom Mar 15, 2017
pks-t:pks/submodule-index-fixpks-t/libgit2:pks/submodule-index-fixCopy head branch name to clipboard
Merged
submodule: catch when submodule is not staged on update#4161ethomson merged 1 commit intolibgit2:masterlibgit2/libgit2:masterfrom pks-t:pks/submodule-index-fixpks-t/libgit2:pks/submodule-index-fixCopy head branch name to clipboard
ethomson merged 1 commit intolibgit2:masterlibgit2/libgit2:masterfrom
pks-t:pks/submodule-index-fixpks-t/libgit2:pks/submodule-index-fixCopy head branch name to clipboard
Conversation
When calling `git_submodule_update` on a submodule, we have to retrieve the ID of the submodule entry in the index. If the function is called on a submodule which is only partly initialized, the submodule entry may not be added to the index yet. This leads to an assert when trying to look up the blob later on. Fix the issue by checking if the index actually holds the submodule's ID and erroring out if it does not.
Member
|
Thanks! 😄 |
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
When calling
git_submodule_updateon a submodule, we have to retrievethe ID of the submodule entry in the index. If the function is called on
a submodule which is only partly initialized, the submodule entry may
not be added to the index yet. This leads to an assert when trying to
look up the blob later on.
Fix the issue by checking if the index actually holds the submodule's
ID and erroring out if it does not.
The issue has been uncovered by #4149. Even though it was incorrect usage of the API, this should not result in an assert but in an error, instead.