Skip to content

Conversation

@aggarw13
Copy link

Description of changes:
git submodule update --remote -f fails for coreJSON submodule as the submodule pointer update is attempted on origin/master instead of origin/main

╰─➤  git submodule update --init -f --remote
Submodule path 'libraries/3rdparty/CMock': checked out '9c1c6a05dc7aa41d6a2da39b9f916be373ef050e'
Submodule path 'libraries/aws/device-defender-for-aws-iot-embedded-sdk': checked out '9ba281dafdf7f48941fc7f20740716883019fcfc'
Submodule path 'libraries/aws/device-shadow-for-aws-iot-embedded-sdk': checked out 'fabbece424c03f2f90a2c5b1117bcb44cbe9257b'
Submodule path 'libraries/aws/jobs-for-aws-iot-embedded-sdk': checked out '2c6628c36cb905763037265776d0d811ec7f863d'
Submodule path 'libraries/standard/coreHTTP': checked out '0882657628eb7df12dc957f9b122601fd3054a68'
fatal: Needed a single revision
Unable to find current origin/master revision in submodule path 'libraries/standard/coreJSON'

This PR fixes the issue by adding a tracking branch configuration for the coreJSON submodule.

By submitting this pull request, I confirm that my contribution is made under the terms of the MIT license.

@aggarw13 aggarw13 requested a review from nateglims November 18, 2020 18:31
@nateglims
Copy link
Member

Other repos are converted but haven't deleted their master branch yet. Should we update them all at once?

url = https://github.com/FreeRTOS/coreHTTP.git
[submodule "libraries/standard/coreJSON"]
path = libraries/standard/coreJSON
branch = main
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like it's lame we have to do this

Co-authored-by: SarenaAWS <6563840+sarenameas@users.noreply.github.com>
nateglims
nateglims previously approved these changes Nov 18, 2020
sarenameas
sarenameas previously approved these changes Nov 18, 2020
@sarenameas sarenameas dismissed stale reviews from nateglims and themself via 3b23bbc November 19, 2020 01:40
sarenameas
sarenameas previously approved these changes Nov 19, 2020
dan4thewin
dan4thewin previously approved these changes Nov 19, 2020
@sarenameas sarenameas dismissed stale reviews from dan4thewin and themself via f916f82 November 19, 2020 01:41
@aggarw13 aggarw13 merged commit 8788aa1 into master Nov 19, 2020
@aggarw13 aggarw13 deleted the fix/core-json-submodule-update branch November 19, 2020 02:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants