Cover all cases of submodule status in check-git-abc #4908
+9
−0
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
A '+'-prefix means that the submodule is initialized and checked out, but a different commit is checked out. If this is accidental then the user should run `git submodule update` to fix it. If it is intentional (because e.g. the user is explicitly wanting to test Yosys with a different version of abc), then creating a new commit in Yosys to update the expected commit is also a valid solution.
Covering all the bases, I guess? '-'-prefix is already correctly handled by the base case message. If the user somehow gets merge conflicts in abc, hopefully they know what they're doing.
|
@widlarizer Is abc the only submodule that we care enough about being the exact version to raise an error when it's not? Because the current suggestion to use |
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 are the reasons/motivation for this change?
git submodule statuscan be prefixed with[ -+U], of which we expect the space, and assume anything else is a-. But seeing an error message that tells you abc is not initialized when it is initialized but pointing at a different commit is confusing.Also closes #4888.
Explain how this is achieved.
Handle the
[+U]cases and give an actually related error message instead of the generic one.If applicable, please suggest to reviewers how they can test the change.