bpo-37936: Avoid ignoring files that we actually do track. (GH-15451) · python/cpython@c837ad4 · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 37.4k
• Star 77.5k

• Code
• Issues 5k+
• Pull requests 2.7k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit c837ad4

Browse filesBrowse the repository at this point in the historyBrowse files

miss-islington

and

gnprice

authored

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 961d54c. https://bugs.python.org/issue37936 (cherry picked from commit 5e5e951) Co-authored-by: Greg Price <gnprice@gmail.com>

1 parent ebca7eb commit c837ad4
Copy full SHA for c837ad4

2 files changed

+6-3Lines changed: 6 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .gitignore
• Misc/NEWS.d/next/Build
  • 2019-08-24-00-29-40.bpo-37936.QrORqA.rst

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.gitignore‎

Copy file name to clipboardExpand all lines: .gitignore

+4-3Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -27,12 +27,12 @@ Include/pydtrace_probes.h
27	27	Lib/distutils/command/*.pdb
28	28	Lib/lib2to3/*.pickle
29	29	Lib/test/data/*
30		- Makefile
	30	+ !Lib/test/data/README
	31	+ /Makefile
31	32	Makefile.pre
32	33	Misc/python.pc
33	34	Misc/python-embed.pc
34	35	Misc/python-config.sh
35		- Modules/Setup
36	36	Modules/Setup.config
37	37	Modules/Setup.local
38	38	Modules/config.c
@@ -78,6 +78,7 @@ config.log
78	78	config.status
79	79	config.status.lineno
80	80	core
	81	+ !Tools/msi/core/
81	82	db_home
82	83	.hg/
83	84	.idea/
@@ -88,7 +89,7 @@ libpython*.dylib
88	89	libpython*.dll
89	90	platform
90	91	pybuilddir.txt
91		- pyconfig.h
	92	+ /pyconfig.h
92	93	python-config
93	94	python-config.py
94	95	python.bat

Collapse file

‎Misc/NEWS.d/next/Build/2019-08-24-00-29-40.bpo-37936.QrORqA.rst‎

Copy file name to clipboard

+2Lines changed: 2 additions & 0 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -0,0 +1,2 @@
	1	+ The :file:`.gitignore` file no longer applies to any files that are in fact
	2	+ tracked in the Git repository. Patch by Greg Price.

0 commit comments

Comments

0 (0)