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

[3.7] bpo-37936: Avoid ignoring files that we actually do track. (GH-15451) #15748

Merged
merged 1 commit into from
Sep 9, 2019

Conversation

miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Sep 9, 2019

There were about 14 files that are actually in the repo but that are
covered by the rules in .gitignore.

Git itself takes no notice of what .gitignore says about files that
it's already tracking... but the discrepancy can be confusing to a
human that adds a new file unexpectedly covered by these rules, as
well as to non-Git software that looks at .gitignore but doesn't
implement this wrinkle in its semantics. (E.g., rg.)

Several of these are from rules that apply more broadly than
intended: for example, Makefile applies to Doc/Makefile and
Tools/freeze/test/Makefile, whereas /Makefile means only the
Makefile at the repo's root.

https://bugs.python.org/issue37936
(cherry picked from commit 5e5e951)

Co-authored-by: Greg Price gnprice@gmail.com

https://bugs.python.org/issue37936

…15451)

There were about 14 files that are actually in the repo but that are
covered by the rules in .gitignore.

Git itself takes no notice of what .gitignore says about files that
it's already tracking... but the discrepancy can be confusing to a
human that adds a new file unexpectedly covered by these rules, as
well as to non-Git software that looks at .gitignore but doesn't
implement this wrinkle in its semantics.  (E.g., `rg`.)

Several of these are from rules that apply more broadly than
intended: for example, `Makefile` applies to `Doc/Makefile` and
`Tools/freeze/test/Makefile`, whereas `/Makefile` means only the
`Makefile` at the repo's root.

https://bugs.python.org/issue37936
(cherry picked from commit 5e5e951)

Co-authored-by: Greg Price <gnprice@gmail.com>
@zware zware merged commit 9ae9ac1 into python:3.7 Sep 9, 2019
@miss-islington miss-islington deleted the backport-5e5e951-3.7 branch September 9, 2019 13:10
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.

5 participants