bpo-37936: Avoid ignoring files that we actually do track. (GH-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.
And the `Modules/Setup` rule simply wasn't updated after 961d54c5c.
https://bugs.python.org/issue37936
(cherry picked from commit 5e5e9515029f70836003a8cfb30433166fcc8db7)
Co-authored-by: Greg Price <gnprice@gmail.com>
diff --git a/.gitignore b/.gitignore
index 9c0c2ef..648f07e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,12 +27,12 @@
Lib/distutils/command/*.pdb
Lib/lib2to3/*.pickle
Lib/test/data/*
-Makefile
+!Lib/test/data/README
+/Makefile
Makefile.pre
Misc/python.pc
Misc/python-embed.pc
Misc/python-config.sh
-Modules/Setup
Modules/Setup.config
Modules/Setup.local
Modules/config.c
@@ -78,6 +78,7 @@
config.status
config.status.lineno
core
+!Tools/msi/core/
db_home
.hg/
.idea/
@@ -88,7 +89,7 @@
libpython*.dll
platform
pybuilddir.txt
-pyconfig.h
+/pyconfig.h
python-config
python-config.py
python.bat