From a18e7001ade11b34bc56f1fb5df25af7464b51ee Mon Sep 17 00:00:00 2001 From: Greg Price Date: Mon, 9 Sep 2019 02:34:50 -0700 Subject: [PATCH] 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. https://bugs.python.org/issue37936 (cherry picked from commit 5e5e9515029f70836003a8cfb30433166fcc8db7) Co-authored-by: Greg Price --- .gitignore | 6 ++++-- .../next/Build/2019-08-24-00-29-40.bpo-37936.QrORqA.rst | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Build/2019-08-24-00-29-40.bpo-37936.QrORqA.rst diff --git a/.gitignore b/.gitignore index cdfe476088a8dd..6ebf6247f67284 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,8 @@ 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-config.sh @@ -77,6 +78,7 @@ config.log config.status config.status.lineno core +!Tools/msi/core/ db_home .hg/ .idea/ @@ -87,7 +89,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 00000000000000..4c6486103881af --- /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.