fix: force submodule to point at right upstream version #21
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
Our submodule was pointing at un unpublished rev. The reason is that we have the submodule set to ignore changes (thanks to a2bd014), and so our `git add` command in `ck.sh` wasn't having any effect, and we ended up committing a reference to something that we only had in one of our local repos (probably a temporary "liferay" branch). This commit adds an `-f` to the `git add` invocation to prevent this from happening again, and forces the submodule to point at a published commit.
Just confirming that the parent commit really fixes things. I created a fresh clone of the repo, ran `./ck.sh setup` (it worked), then `./ck.sh build`, and this is the result. As you can see, only the timestamp-related aspects have changed; we don't need to cut a new release.
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.
Our submodule was pointing at un unpublished rev. The reason is that we have the submodule set to ignore changes (thanks to a2bd014), and so our
git addcommand inck.shwasn't having any effect, and we ended up committing a reference to something that we only had in one of our local repos (probably a temporary "liferay" branch).This commit adds an
-fto thegit addinvocation to prevent this from happening again, and forces the submodule to point at a published commit.