[3.7] bpo-37936: Remove some .gitignore rules that were intended locally. (GH-15542) #15553
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ythonGH-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>
zware
approved these changes
Aug 27, 2019
|
@gnprice: Status check is done, and it's a success ✅ . |
|
@gnprice: Status check is done, and it's a success ✅ . |
77E0
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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/excludefile is a handy wayto 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
https://bugs.python.org/issue37936