scripts/promote-config: fix git submodule handling #194
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 `--recurse-submodules` option to `git reset` only works if there are already submodules to recurse into. In the case where we're promoting from one branch which has a submodule to one which doesn't, this will not cause a git submodule directory to be created. Instead, we need to explicitly initialize potential new submodules. We also need to handle the case where the submodule did exist but it was bumped by the promotion and so we need to update it. Calling `git submodule update --init` handles both cases.
|
after this merges we can add the |
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.
The
--recurse-submodulesoption togit resetonly works if there are already submodules to recurse into. In the case where we're promoting from one branch which has a submodule to one which doesn't, this will not cause a git submodule directory to be created. Instead, we need to explicitly initialize potential new submodules.We also need to handle the case where the submodule did exist but it was bumped by the promotion and so we need to update it.
Calling
git submodule update --inithandles both cases.