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

Mark the miniconda distro folder as vendored. #4902

Merged
merged 2 commits into from
Dec 6, 2018
Merged

Conversation

huguesv
Copy link
Contributor

@huguesv huguesv commented Dec 6, 2018

Fix #4900

https://github.com/github/linguist#overrides

Didn't bother doing that with typeshed folder, since Analysis project will be removed soon.

.gitattributes Outdated
@@ -11,3 +11,6 @@

# Some Windows-specific files should always be CRLF
*.bat eol=crlf

# Language detection
PTVS/Python/Product/Miniconda/Miniconda3-x64/ linguist-vendored
Copy link
Member

Choose a reason for hiding this comment

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

This needs to rooted at the repo, which means you shouldn't include PTVS. I also think you still need the wildcard at the end, i.e.:

Python/Product/Miniconda/Miniconda3-x64/* linguist-vendored

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right, fixing

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

Copy link
Member

@jakebailey jakebailey left a comment

Choose a reason for hiding this comment

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

LGTM

@huguesv huguesv merged commit bd15a55 into master Dec 6, 2018
@huguesv huguesv deleted the huguesv-linguist branch December 6, 2018 17:30
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