v5.0.x: autogen.pl: fix submodule hash check #10808
Merged
Conversation
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
Update the git submodule check to just look at the first character in each line of "git submodule status" output: * If it's "-", then the submodule is missing (this check was already there) * If it's "+", then the locally-checked out hash is different than what is expected by the submodule, so emit a warning (this check was there, but was incorrect) Signed-off-by: Jeff Squyres <[email protected]> (cherry picked from commit f9fc72a)
|
Moving to draft, per #10807 (comment) |
The output of `git submodule status` will be of the following form: ``` Xgit_hash submodule_path [(git_ref)] ``` * `X` is either a space, `+`, or `-` * `git_hash` is 40 hex digits * `submodule_path` is the path in the repo where the submodule is located * `(git_ref)` is optional, and will not be there if the submodule is missing (which the previous regexp did not handle). This commit tightens up the regexp to be a bit more robust and handle the case where the git_ref token is not present. Signed-off-by: Jeff Squyres <[email protected]> (cherry picked from commit 5c66993)
|
Added commit from #10810 to make the autogen test more robust. This PR is now ready. |
bwbarrett
approved these changes
Sep 19, 2022
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.
Update the git submodule check to just look at the first character in each line of "git submodule status" output:
Signed-off-by: Jeff Squyres [email protected]
(cherry picked from commit f9fc72a)