On 01.02.2024 14:32, George Dunlap wrote: > On Thu, Jun 23, 2022 at 12:54 PM Jan Beulich <[email protected]> wrote: > >> By using | instead of || or (in the negated form) && chances increase >> for the compiler to recognize that both predicates can actually be >> folded into an expression requiring just a single branch (via OR-ing >> together the respective P2M_*_TYPES constants). >> >> Signed-off-by: Jan Beulich <[email protected]> >> > > Sorry for the delay. Git complains that this patch is malformed: > > error: `git apply --index`: error: corrupt patch at line 28 > > Similar complaint from patchew when it was posted: > > https://patchew.org/Xen/[email protected]/
Not sure what to say. The patch surely is well-formed. It applies fine using patch (when not taken from email). When taken from email, patch mentions that it strips CRs (I'm running my email client on Windows), but the saved email still applies fine. "git am" indeed is unhappy when taking the plain file as saved from email, albeit here with an error different from yours. If I edit the saved email to retain just the From: and Subject: tags, all is fine. I can't tell what git doesn't like. The error messages (the one you see and the one I got) tell me nothing. I'm also not aware of there being a requirement that patches I send via email need to be "git am"-able (unlike in xsa.git, where I edit patches enough to be suitable for that), nor am I aware how I would convince my email client and/or server to omit whatever git doesn't like or to add whatever git is missing. Bottom line - your response would be actionable by me only in so far as I could switch to using "git send-email". Which I'm afraid I'm not going to do unless left with no other choice. The way I've been sending patches has worked well for over 20 years, and for different projects. (I'm aware Andrew has some special "Jan" command to apply patches I send, but I don't know any specifics.) Jan
