https://bugs.winehq.org/show_bug.cgi?id=55710 --- Comment #34 from Dmitry Timoshkov <dmitry(a)baikal.ru> --- (In reply to Zeb Figura from comment #17)
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.
No, I don't have "apply.whitespace = error" in local or global .gitconfig.
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.
Does it fail for you when applying https://github.com/wine-staging/wine-staging/blob/master/patches/vcomp_for_d... ? If I specify --backend=git-am or use 'git am' to apply this patch I get $ git am 0001-vcomp-Implement-_vcomp_for_dynamic_init_i8.patch Applying: vcomp: Implement _vcomp_for_dynamic_init_i8 .git/rebase-apply/patch:26: trailing whitespace. .git/rebase-apply/patch:30: trailing whitespace. warning: 2 lines add whitespace errors. * * You have some suspicious patch lines: * * In dlls/vcomp/main.c * trailing whitespace (line 1049) dlls/vcomp/main.c:1049: * trailing whitespace (line 1053) dlls/vcomp/main.c:1053: and as a result I get broken git tree state and have to use 'git am --abort'. On the other hand 'git apply' doesn't fail: $ git apply 0001-vcomp-Implement-_vcomp_for_dynamic_init_i8.patch 0001-vcomp-Implement-_vcomp_for_dynamic_init_i8.patch:32: trailing whitespace. 0001-vcomp-Implement-_vcomp_for_dynamic_init_i8.patch:36: trailing whitespace. warning: 2 lines add whitespace errors. Could you please fix this patch so it applies cleanly? -- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.