diff options
| author |   Greg Price <gnprice@gmail.com> | 2019-09-09 02:34:50 -0700 |
|---|---|---|
| committer |   Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-09-09 02:34:50 -0700 |
| commit | 5e5e9515029f70836003a8cfb30433166fcc8db7 (patch) | |
| tree | 1e53ca7e10006ef1f133f7e0b011f4169acbf6fc /.gitignore | |
| parent | bpo-32587: Make winreg.REG_MULTI_SZ support zero-length strings (#13239) (diff) | |
| download | cpython-5e5e9515029f70836003a8cfb30433166fcc8db7.tar.gz cpython-5e5e9515029f70836003a8cfb30433166fcc8db7.tar.bz2 cpython-5e5e9515029f70836003a8cfb30433166fcc8db7.zip | |
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
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 9f3b1ac83b5..54c598e109e 100644 --- a/.gitignore +++ b/.gitignore @@ -27,12 +27,12 @@ Include/pydtrace_probes.h 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 @@ -79,6 +79,7 @@ config.log config.status config.status.lineno core +!Tools/msi/core/ db_home .hg/ .idea/ @@ -89,7 +90,7 @@ libpython*.dylib libpython*.dll platform pybuilddir.txt -pyconfig.h +/pyconfig.h python-config python-config.py python.bat |