diff options
| author | Greg Price <gnprice@gmail.com> | 2019-09-09 09:34:50 (GMT) |
|---|---|---|
| committer | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-09-09 09:34:50 (GMT) |
| commit | 5e5e9515029f70836003a8cfb30433166fcc8db7 (patch) | |
| tree | 1e53ca7e10006ef1f133f7e0b011f4169acbf6fc | |
| parent | e223ba13d8d871ee58570dfca4e82a591189cc2f (diff) | |
| download | cpython-5e5e9515029f70836003a8cfb30433166fcc8db7.zip cpython-5e5e9515029f70836003a8cfb30433166fcc8db7.tar.gz cpython-5e5e9515029f70836003a8cfb30433166fcc8db7.tar.bz2 | |
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
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Build/2019-08-24-00-29-40.bpo-37936.QrORqA.rst | 2 |
2 files changed, 6 insertions, 3 deletions
@@ -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 diff --git a/Misc/NEWS.d/next/Build/2019-08-24-00-29-40.bpo-37936.QrORqA.rst b/Misc/NEWS.d/next/Build/2019-08-24-00-29-40.bpo-37936.QrORqA.rst new file mode 100644 index 0000000..4c64861 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2019-08-24-00-29-40.bpo-37936.QrORqA.rst @@ -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. |