Skip to content

Conversation

@seefood
Copy link
Contributor

@seefood seefood commented Aug 24, 2025

finishing touches to the changes and updates from #2063
protection of /vendor from pre-commit.

Copy link
Contributor

@akinomyoga akinomyoga left a 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?

@seefood
Copy link
Contributor Author

seefood commented Aug 24, 2025

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...

@akinomyoga
Copy link
Contributor

akinomyoga commented Aug 24, 2025

Well, they are not submodules,

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.

feel free to offer other ideas,

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 git vendor update. If the upstream is unmaintained and doesn't respond, you should fork the repository of the upstream project, create a commit in the forked repository, and switch the vendor reference to the forked repository.

@seefood
Copy link
Contributor Author

seefood commented Aug 25, 2025

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.

@seefood seefood force-pushed the ira/completion-cleanup branch from 142ad46 to 51cc753 Compare August 25, 2025 06:00
@seefood
Copy link
Contributor Author

seefood commented Aug 25, 2025

I decided to exclude them in the pre-commit and call it a day.

@seefood seefood force-pushed the ira/completion-cleanup branch from 51cc753 to 1cb987f Compare August 25, 2025 06:29
@seefood seefood requested a review from akinomyoga August 25, 2025 06:31
@akinomyoga
Copy link
Contributor

I decided to exclude them in the pre-commit and call it a day.

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.

@seefood seefood merged commit e2488f2 into master Aug 26, 2025
10 of 11 checks passed
@seefood seefood deleted the ira/completion-cleanup branch August 26, 2025 11:28
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