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.

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

Simplifies diff-filter for modified files except deletes #222

Merged
merged 1 commit into from
Feb 25, 2022

Conversation

colindean
Copy link
Contributor

This comes by recommendation of @newren in the thread related to #221.

I could only see this being regrettable if a new filter type was added that Peru doesn't want. I speculate that such is unlikely so this is probably safe.

This comes by recommendation of @newren in the thread related to buildinspace#221.

I could only see this being regrettable if a new filter type was added
that Peru doesn't want. I speculate that such is unlikely so this is
probably safe.

[1]: https://lore.kernel.org/git/CABPp-BEZj4opBu+wo2whOCHrck1qMjZXfDY9tAE5FbB=Wr9F_w@mail.gmail.com/
@oconnor663
Copy link
Member

Thanks! I'm still trying to figure out the details of how to work with git checkout --no-overwrite-ignore, but I'll come back to this as soon as that's in.

@colindean
Copy link
Contributor Author

Fine with me! I started to look into that but exceeded the amount of time I could put into it for a few days and decided on some low-hanging fruit!

@oconnor663
Copy link
Member

oconnor663 commented Dec 17, 2021

Yeah the other bug is 1) a fairly subtle behavior in 2) an especially complicated section of 3) some very old code that I can barely remember. The issues that come up with checkout are things like "it doesn't seem like checkout can tolerate empty trees", which are solvable, but which are very non-obvious just looking at the test failures that they trigger. Also it's pretty important that the solution doesn't increase the number of shell-outs we do on the fast path through this code. I wouldn't recommend that anyone else dive into it 😅

@oconnor663 oconnor663 merged commit e13d1a8 into buildinspace:master Feb 25, 2022
@oconnor663
Copy link
Member

Sorry for letting this sit for so long. I'm going to disable the problematic test rather than blocking everything on it.

@colindean colindean deleted the simplify-diff-filter branch February 25, 2022 21:43
@colindean
Copy link
Contributor Author

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants