Skip to content

Commit

Permalink
bpo-37936: Avoid ignoring files that we actually do track. (GH-15451)
Browse files Browse the repository at this point in the history
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 961d54c.

https://bugs.python.org/issue37936
(cherry picked from commit 5e5e951)

Co-authored-by: Greg Price <[email protected]>
  • Loading branch information
miss-islington and gnprice authored Sep 9, 2019
1 parent ebca7eb commit c837ad4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -78,6 +78,7 @@ config.log
config.status
config.status.lineno
core
!Tools/msi/core/
db_home
.hg/
.idea/
Expand All @@ -88,7 +89,7 @@ libpython*.dylib
libpython*.dll
platform
pybuilddir.txt
pyconfig.h
/pyconfig.h
python-config
python-config.py
python.bat
Expand Down
Original file line number Diff line number Diff line change
@@ -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.

0 comments on commit c837ad4

Please sign in to comment.