8000 [3.7] bpo-37936: Remove some .gitignore rules that were intended locally. (GH-15542) by miss-islington · Pull Request #15553 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.7] bpo-37936: Remove some .gitignore rules that were intended locally. (GH-15542) #15553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 27, 2019
Merged

[3.7] bpo-37936: Remove some .gitignore rules that were intended locally. (GH-15542) #15553

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
bpo-37936: Remove some .gitignore rules that were intended locally. (G… 
…H-15542)

These appeared in commit c5ae169.  The comment on them, as well as
the presence among them of a rule for the .gitignore file itself,
indicate that the author intended these lines to remain only in their
own local working tree -- not to get committed even to their own repo,
let alone merged upstream.

They did nevertheless get committed, because it turns out that Git
takes no notice of what .gitignore says about files that it's already
tracking... for example, this .gitignore file itself.

Give effect to these lines' original intention, by deleting them. :-)

Git tip, for reference: the `.git/info/exclude` file is a handy way
to do exactly what these lines were originally intended to do.  A
related handy file is `~/.config/git/ignore`.  See gitignore(5),
aka `git help ignore`, for details.

https://bugs.python.org/issue37936

Automerge-Triggered-By: @zware
(cherry picked from commit 8c9e9b0)

Co-authored-by: Greg Price <gnprice@gmail.com>
  • Loading branch information
@gnprice @miss-islington
gnprice authored and miss-islington committed Aug 27, 2019
commit b7f8ea3a47c37bb43748b70a30e9f2b739d501fa
8 changes: 1 addition & 7 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
# added for local development
.buildaix/
Modules/python.exp
buildaix/
installp/
.gitignore

# Two-trick pony for OSX and other case insensitive file systems:
# Ignore ./python binary on Unix but still look into ./Python/ directory.
/python
!/Python/

*.cover
*.iml
*.o
Expand Down
0