-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Cleanups that should have been part of #2063 #2333
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
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not familiar with git vendor and git subtree, but wouldn't this cause serious conflicts with the upstream in running git vendor update?
Well, they are not submodules, so if the pre-commit complains about them, I fix them... feel free to offer other ideas, because otherwise this mess won't solve itself, but maybe an LLM could help... |
Could you explain it in detail? Yes, they are not submodules, but I currently don't see how that fact changes the situation. The global indentation change will introduce global conflicts regardless of whether it is submodule or subtree.
First, you shouldn't touch the indentation. I don't think the difference of the indetation style should be counted as "a mess". Next, for the substantial fixes raised by pre-commit (if you care about them at all), you should first send the fixes to the upstream, and after they are merged, you should pull the changes by |
|
well, what happens when it gets to the CI and paints it red like it did for me? do we now create a mechanism to blacklist /vendor from coverage? the indentation fixes happened by the invisible had of pre-commit, I can undo that. |
142ad46 to
51cc753
Compare
|
I decided to exclude them in the pre-commit and call it a day. |
51cc753 to
1cb987f
Compare
I believe this is a reasonable choice. In the case of submodules, people wouldn't try to apply the project style to the submodule repositories managed by third parties. Subtrees are similar to submodules in the sense that the contents are synchronized with the upstreams. |
finishing touches to the changes and updates from #2063
protection of /vendor from pre-commit.