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

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 5e5e951502)

Authored-by: Greg Price <gnprice@gmail.com>
This commit is contained in:
Miss Islington (bot) 2019-09-09 06:10:19 -07:00 committed by Zachary Ware
parent 58a7f809ac
commit 9ae9ac1061
2 changed files with 6 additions and 2 deletions

6
.gitignore vendored
View File

@ -27,7 +27,8 @@ Include/pydtrace_probes.h
Lib/distutils/command/*.pdb Lib/distutils/command/*.pdb
Lib/lib2to3/*.pickle Lib/lib2to3/*.pickle
Lib/test/data/* Lib/test/data/*
Makefile !Lib/test/data/README
/Makefile
Makefile.pre Makefile.pre
Misc/python.pc Misc/python.pc
Misc/python-config.sh Misc/python-config.sh
@ -77,6 +78,7 @@ config.log
config.status config.status
config.status.lineno config.status.lineno
core core
!Tools/msi/core/
db_home db_home
.hg/ .hg/
.idea/ .idea/
@ -87,7 +89,7 @@ libpython*.dylib
libpython*.dll libpython*.dll
platform platform
pybuilddir.txt pybuilddir.txt
pyconfig.h /pyconfig.h
python-config python-config
python-config.py python-config.py
python.bat python.bat

View File

@ -0,0 +1,2 @@
The :file:`.gitignore` file no longer applies to any files that are in fact
tracked in the Git repository. Patch by Greg Price.