Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

submodule nits #1506

Merged
merged 5 commits into from
Jul 9, 2020
Merged

submodule nits #1506

merged 5 commits into from
Jul 9, 2020

Conversation

rwalker-apple
Copy link
Contributor

Problem

irregular configs for submodules

Summary of Changes

make regular

@@ -41,7 +41,7 @@
ignore = dirty
commit = 35be9760b4edf485287f78c0cf652beb19c047f0
[submodule "pigweed"]
path = third_party/pigweed
path = third_party/pigweed/repo
Copy link
Contributor

Choose a reason for hiding this comment

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

Thank you!

@rwalker-apple
Copy link
Contributor Author

I don't know how to fix the lgtm failure off hand. I think I could have a PR where pigweed is mapped in twice? hope we can land without lgtm

@mspang
Copy link
Contributor

mspang commented Jul 8, 2020

I don't know how to fix the lgtm failure off hand. I think I could have a PR where pigweed is mapped in twice? hope we can land without lgtm

Try:

git mv third_party/pigweed pigweed
mkdir -p third_party/pigweed
git mv pigweed third_party/pigweed/repo

@rwalker-apple
Copy link
Contributor Author

@woody-apple this is ready

Copy link
Contributor

@turon turon left a comment

Choose a reason for hiding this comment

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

Looks good. Thanks.

@woody-apple
Copy link
Contributor

@jelderton @hawk248 @andy31415 ?

@woody-apple
Copy link
Contributor

@rwalker-apple can we fix the conflicts here?

@rwalker-apple
Copy link
Contributor Author

@woody-apple ready

@andy31415 andy31415 merged commit 488cbac into project-chip:master Jul 9, 2020
@rwalker-apple rwalker-apple deleted the submodule-nit branch July 9, 2020 13:48
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.

8 participants