Skip to content

Clean third_party/googleapis submodules.#2

Merged
aalexand merged 2 commits intoGoogleCloudPlatform:masterfrom
jqll:googleapis-submodule
Jul 11, 2018
Merged

Clean third_party/googleapis submodules.#2
aalexand merged 2 commits intoGoogleCloudPlatform:masterfrom
jqll:googleapis-submodule

Conversation

@jqll
Copy link
Copy Markdown
Contributor

@jqll jqll commented Jul 11, 2018

Remove submodules from git index with "git rm".

Remove submodules from git index with "git rm".
@jqll jqll requested a review from aalexand July 11, 2018 19:47
Comment thread third_party/googleapis/README.google Outdated
$ git subtree add --prefix third_party/googleapis googleapis master --squash
$ rm third_party/googleapis/.gitmodules
$ # For all submodules:
$ git rm third_party/googleapis/{path_to_submodule}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Could this use "git submodule foreach"?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

"git submodule foreach" returns fatal: No url found for submodule path 'third_party/googleapis/third_party/boringssl-with-bazel' in .gitmodules (with third_party/googleapis/.gitmodules undeleted). Not sure how to make use of .gitmodules in a subtree. Also sounds like 'git submodule foreach' will skip uninitialized module. We probably don't want to initialize them?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I am just not sure what "For all submodules" means here. Is this command something that needs to be run every time the subtree needs to be updated? If so, the instructions on what "all" means here should be clearer (ideally just some command that gathers that). If this text is about the one time subtree addition that was done, then perhaps list explicit submodules you removed?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It's a one time setup. It's sufficient to follow "To update from remote on an ongoing basis" instructions below to update the subtree.

Sure, updated the PR to list explicit submodules removed.

@aalexand aalexand merged commit dabfb14 into GoogleCloudPlatform:master Jul 11, 2018
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.

2 participants