Skip to content

Commit f1e559b

Browse files
author
Erlend Egeberg Aasland
authored
Update generated files list and add diff=generated attribute (pythonGH-30745)
As a side effect, the list of generated files is relocated after the language aware diff settings. Closes python/core-workflow#425 Automerge-Triggered-By: GH:zware
1 parent bc67f18 commit f1e559b

File tree

1 file changed

+28
-18
lines changed

1 file changed

+28
-18
lines changed

.gitattributes

+28-18
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,6 @@ Lib/test/test_importlib/namespacedata01/* -text
4040
PCbuild/readme.txt text eol=crlf
4141
PC/readme.txt text eol=crlf
4242

43-
# Generated files
44-
# https://github.com/github/linguist/blob/master/docs/overrides.md
45-
**/clinic/*.h linguist-generated=true
46-
Python/deepfreeze/*.c linguist-generated=true
47-
Python/frozen_modules/*.h linguist-generated=true
48-
Python/frozen_modules/MANIFEST linguist-generated=true
49-
Include/internal/pycore_ast.h linguist-generated=true
50-
Python/Python-ast.c linguist-generated=true
51-
Include/opcode.h linguist-generated=true
52-
Python/opcode_targets.h linguist-generated=true
53-
Objects/typeslots.inc linguist-generated=true
54-
*_db.h linguist-generated=true
55-
Doc/library/token-list.inc linguist-generated=true
56-
Include/token.h linguist-generated=true
57-
Lib/token.py linguist-generated=true
58-
Parser/token.c linguist-generated=true
59-
Programs/test_frozenmain.h linguist-generated=true
60-
6143
# Language aware diff headers
6244
# https://tekin.co.uk/2020/10/better-git-diff-output-for-ruby-python-elixir-and-more
6345
# https://gist.github.com/tekin/12500956bd56784728e490d8cef9cb81
@@ -67,3 +49,31 @@ Programs/test_frozenmain.h linguist-generated=true
6749
*.html diff=html
6850
*.py diff=python
6951
*.md diff=markdown
52+
53+
# Generated files
54+
# https://github.com/github/linguist/blob/master/docs/overrides.md
55+
#
56+
# To always hide generated files in local diffs, mark them as binary:
57+
# $ git config diff.generated.binary true
58+
#
59+
[attr]generated linguist-generated=true diff=generated
60+
61+
**/clinic/*.c.h generated
62+
*_db.h generated
63+
Doc/library/token-list.inc generated
64+
Include/internal/pycore_ast.h generated
65+
Include/internal/pycore_ast_state.h generated
66+
Include/opcode.h generated
67+
Include/token.h generated
68+
Lib/keyword.py generated
69+
Lib/token.py generated
70+
Objects/typeslots.inc generated
71+
Parser/parser.c generated
72+
Parser/token.c generated
73+
Programs/test_frozenmain.h generated
74+
Python/Python-ast.c generated
75+
Python/opcode_targets.h generated
76+
Python/stdlib_module_names.h generated
77+
Tools/peg_generator/pegen/grammar_parser.py generated
78+
aclocal.m4 generated
79+
configure generated

0 commit comments

Comments
 (0)