Skip to content
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

Jump to bottom

bpo-37936: Avoid ignoring files that we actually do track. #15451

Merged
merged 1 commit into from
Sep 9, 2019
Merged

bpo-37936: Avoid ignoring files that we actually do track. #15451

merged 1 commit into from
Sep 9, 2019

Conversation

gnprice
Copy link
Contributor

@gnprice gnprice commented Aug 24, 2019 •
edited by miss-islington
Loading

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

Automerge-Triggered-By: @zware

@brettcannon brettcannon self-requested a review August 26, 2019 17:50
zware
zware approved these changes Aug 27, 2019
View reviewed changes
Copy link
Member

@zware zware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after a rebase.

@gnprice
bpo-37936: Avoid ignoring files that we actually do track.
e13f25d 
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.
@gnprice gnprice force-pushed the pr-unignore-tracked branch from d33576f to e13f25d Compare August 27, 2019 19:07
@gnprice
Copy link
Contributor Author

gnprice commented Aug 27, 2019

Thanks for the review! Rebased.

@miss-islington
Copy link
Contributor

Sorry, I can't merge this PR. Reason: Base branch was modified. Review and try the merge again..

1 similar comment
@miss-islington
Copy link
Contributor

Sorry, I can't merge this PR. Reason: Base branch was modified. Review and try the merge again..

@miss-islington miss-islington merged commit 5e5e951 into python:master Sep 9, 2019
@miss-islington
Copy link
Contributor

Thanks @gnprice for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7, 3.8.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 9, 2019
@gnprice @miss-islington
bpo-37936: Avoid ignoring files that we actually do track. (pythonGH-…
eff15e0 
…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>
@bedevere-bot
Copy link

GH-15747 is a backport of this pull request to the 3.8 branch.

@bedevere-bot
Copy link

GH-15748 is a backport of this pull request to the 3.7 branch.

@zware
Copy link
Member

zware commented Sep 9, 2019

Thanks for the patch!

zware pushed a commit to zware/cpython that referenced this pull request Sep 9, 2019
@gnprice @zware
bpo-37936: Avoid ignoring files that we actually do track. (pythonGH-…
a18e700 
…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.

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

Co-authored-by: Greg Price <gnprice@gmail.com>
miss-islington added a commit that referenced this pull request Sep 9, 2019
@miss-islington @gnprice
bpo-37936: Avoid ignoring files that we actually do track. (GH-15451)
c837ad4 
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>
zware pushed a commit that referenced this pull request Sep 9, 2019
@miss-islington @zware
bpo-37936: Avoid ignoring files that we actually do track. (GH-15451) (…
9ae9ac1 
…GH-15748)

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.

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

Authored-by: Greg Price <gnprice@gmail.com>
@gnprice gnprice deleted the pr-unignore-tracked branch September 10, 2019 05:25
@gnprice gnprice mentioned this pull request Sep 10, 2019
Closed
lisroach pushed a commit to lisroach/cpython that referenced this pull request Sep 10, 2019
@gnprice @lisroach
bpo-37936: Avoid ignoring files that we actually do track. (pythonGH-…
8975ba0 
…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
DinoV pushed a commit to DinoV/cpython that referenced this pull request Jan 14, 2020
@gnprice @DinoV
bpo-37936: Avoid ignoring files that we actually do track. (pythonGH-…
f3dd4af 
…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
websurfer5 pushed a commit to websurfer5/cpython that referenced this pull request Jul 20, 2020
@gnprice @websurfer5
bpo-37936: Avoid ignoring files that we actually do track. (pythonGH-…
419b43b 
…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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zware zware zware approved these changes

@brettcannon brettcannon Awaiting requested review from brettcannon

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@gnprice @miss-islington @bedevere-bot @zware @the-knights-who-say-ni