[3.7] bpo-37936: Avoid ignoring files that we actually do track. (GH-15451) - #15748
Merged
Conversation
zware
approved these changes
Sep 9, 2019
…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
force-pushed
the
backport-5e5e951-3.7
branch
from
September 9, 2019 10:06
3995f68 to
a18e700
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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,
Makefileapplies toDoc/MakefileandTools/freeze/test/Makefile, whereas/Makefilemeans only theMakefileat 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