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 after961d54c5c
. https://bugs.python.org/issue37936 (cherry picked from commit5e5e951502
) Co-authored-by: Greg Price <gnprice@gmail.com>
This commit is contained in:
parent
ebca7eb093
commit
c837ad408e
|
@ -27,12 +27,12 @@ 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-embed.pc
|
Misc/python-embed.pc
|
||||||
Misc/python-config.sh
|
Misc/python-config.sh
|
||||||
Modules/Setup
|
|
||||||
Modules/Setup.config
|
Modules/Setup.config
|
||||||
Modules/Setup.local
|
Modules/Setup.local
|
||||||
Modules/config.c
|
Modules/config.c
|
||||||
|
@ -78,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/
|
||||||
|
@ -88,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
|
||||||
|
|
|
@ -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.
|
Loading…
Reference in New Issue