https://bugs.winehq.org/show_bug.cgi?id=55710
--- Comment #17 from Zeb Figura z.figura12@gmail.com --- (In reply to Dmitry Timoshkov from comment #16)
(In reply to Zeb Figura from comment #15)
(In reply to Dmitry Timoshkov from comment #9)
Since wine-staging doesn't use --backend=git-am by default and some of the patches in the staging tree have trailing spaces it's impossible to perform a proper git bisect to find the offending patchset.
It doesn't use it by default, but is there anything preventing you from using --backend=git-am manually?
Although I mentioned it already, probably I wasn't clear enough: specifying --backend=git-am leads to a failure to apply some of the staging patches. Probably patches with trailing spaces went in unnoticed because you don't use git-am which errors out in that case.
I'm guessing you have "apply.whitespace = error" configured, which isn't the default. I'll push a change to explicitly lessen that to warn when applying wine-staging patches.
Not sure about Alistair, but I actually use `git apply' to rebase patches. That's not `git am', but it should be affected by the same configuration setting.
Since the staged patches are supposed to be sent upstream at some point, they should be ready from the start, so I'd suggest to use --backend=git-am by default to spot such things earlier.
Pretty much all wine-staging patches are riddled with enough problems that upstreaming is a whole process of fixing / rewriting anyway. The idea of performing incremental improvements on a patch while it's in the wine-staging repository is nice in theory, and I don't know, maybe it worked for Michael and Sebastian, but for us it's just extra busywork. Easier to take care of that when we actually have time to fix and upstream the patches themselves.