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

Gitignore workaround #1521

Merged
merged 3 commits into from
Apr 30, 2024
Merged

Gitignore workaround #1521

merged 3 commits into from
Apr 30, 2024

Conversation

tmccombs
Copy link
Collaborator

@tmccombs tmccombs commented Mar 14, 2024 •
edited
Loading

Workaround for bug with gitinored files

This is a workaround for
BurntSushi/ripgrep#2711

Fixes: #1461

@tmccombs tmccombs force-pushed the gitignore-workaround branch from 3cc90f5 to a7b5e08 Compare March 14, 2024 05:48
@tmccombs tmccombs requested review from tavianator and sharkdp April 28, 2024 06:16
tavianator
tavianator requested changes Apr 28, 2024
View reviewed changes
Copy link
Collaborator

@tavianator tavianator left a comment

Choose a reason for hiding this comment

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

I think this workaround is incomplete: we should do the same thing if the user passes . as a path explicitly.

It's also worth adding a test case I think.

@tmccombs
Add test for gitignore workaround
43b1960 
And make sure it works for user-supplied path of "."

Also add changelog entry
@tmccombs tmccombs requested a review from tavianator April 30, 2024 06:06
sharkdp
sharkdp reviewed Apr 30, 2024
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
sharkdp
sharkdp approved these changes Apr 30, 2024
View reviewed changes
Copy link
Owner

@sharkdp sharkdp left a comment

Choose a reason for hiding this comment

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

Thank you!

@sharkdp sharkdp merged commit 9279b1f into sharkdp:master Apr 30, 2024
16 checks passed
@tmccombs tmccombs deleted the gitignore-workaround branch April 30, 2024 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tavianator tavianator tavianator approved these changes

@sharkdp sharkdp sharkdp approved these changes

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

Successfully merging this pull request may close these issues.

[BUG] Including hidden files also includes (git)ignored files if the .gitignore is in the parent directory
3 participants
@tmccombs @tavianator @sharkdp