Prevent integration test timeout bc. of sudo
PATCH 1/1 Prevent integration test timeout bc. of sudo
Hi,
Quoted 4 lines · Jens Neuhalfen
Quoted 1 line
From
885471cf0c9918a8a7edbae2b8985e2321aff739Mon Sep 17 00:00:00 2001From: Jens Neuhalfen <[email protected]...>
Date: Sun, 8 May 2016 18:17:48 +0200
Subject: [PATCH] Prevent integration test timeout bc. of sudo
Git isn't liking the way you send your patches - I'll apply it manually (because it makes sense), but please take a look at "git send-email", which will ensure that patches and mail headers, blank encoding, and everything is perfect?
If I try to feed your mail into "git am", it complains about
Applying: Prevent integration test timeout bc. of sudo
fatal: corrupt patch at line 19
Patch failed at 0001 Prevent integration test timeout bc. of sudo
- not sure what it is, but it's usually fixed by "git send-email"... thanks.
ACK mail next :-)
gert
Signature · 4 lines
USENET is *not* the non-clickable part of WWW!
//www.muc.de/~gert/
Gert Doering - Munich, Germany [email protected]...
fax: +49-89-35655025 [email protected]...Hi Gert,
[…]
Quoted 6 lines
Git isn't liking the way you send your patches - I'll apply it manually (because it makes sense), but please take a look at "git send-email", which will ensure that patches and mail headers, blank encoding, and everything is perfect?
Quoted 7 lines
If I try to feed your mail into "git am", it complains about
Applying: Prevent integration test timeout bc. of sudo
fatal: corrupt patch at line 19
Patch failed at 0001 Prevent integration test timeout bc. of sudo- not sure what it is, but it's usually fixed by "git send-email"... thanks.
strange, I use "git format-patch". I guess that "git am” gets confused about the “duplicate" Subject/From/.. lines (mail header and patch header).
I’ll switch to send-email
Cheers
Jens
[…]
Quoted 12 lines · Jens Neuhalfen
Hi Gert,
[…]
Quoted 8 lines
Git isn't liking the way you send your patches - I'll apply it manually (because it makes sense), but please take a look at "git send-email", which will ensure that patches and mail headers, blank encoding, and everything is perfect?
If I try to feed your mail into "git am", it complains about
Quoted 7 lines
Quoted 5 lines
Applying: Prevent integration test timeout bc. of sudo
fatal: corrupt patch at line 19
Patch failed at 0001 Prevent integration test timeout bc. of sudo- not sure what it is, but it's usually fixed by "git send-email"... thanks.
strange, I use "git format-patch". I guess that "git am” gets confused about the “duplicate" Subject/From/.. lines (mail header and patch header).
Generally MUAs are not trustworthy in how they process copy-pasted text. Each MUA behaves differently and requires different tweaks. In this case, I believe it is the first 'From' line in your patch which confuses your Apple Mail, which somehow gets prefixed with a '>'.
Quoted 1 line
I’ll switch to send-email
Thanks! That's the most sane MUA for patches. It does everything correctly (at least for the git universe).
Signature · 3 lines
kind regards, David Sommerseth
Hi,
Quoted 5 lines · Jens Neuhalfen
Quoted 1 line
- not sure what it is, but it's usually fixed by "git send-email"... thanks.
strange, I use "git format-patch". I guess that "git am??? gets confused about the ???duplicate" Subject/From/.. lines (mail header and patch header).
I???ll switch to send-email
It wasn't the duplicate Subject/From lines, but the whitespace mangling - which is something mail clients *love* to do, and git send-email knows how to avoid.
It was not only "git am" - I tried with plain old "patch -p1 <$file", and that first barfed about "invalid patch", and after I fixed the lines that had no space in the first column, complained about "does not apply" because the context was not matching - "patch -l" (ignore whitespace) worked, and that's a fairly good hint that a mail client messed up whitespace...
Note: if you use exchange as your outbound mail server, even git send-email will fail, because exchange *loves* to "fix" leading tabs in mails - Heiko ran into this a while ago.
gert
Signature · 4 lines
USENET is *not* the non-clickable part of WWW!
//www.muc.de/~gert/
Gert Doering - Munich, Germany [email protected]...
fax: +49-89-35655025 [email protected]...ACK.
Your patch has been applied to the master branch.
I found out what the issue is: your mailer chops off whitespace at the beginning of the line, so the patch is corrupt ("^fi" instead of "^ fi"), and after adding a blank to every single line that has no "^+", it worked.
So, please use "git send-email" - it will get this right, always.
commit f40f10ea9607934faeb2b8cd84aefff0e0790189
Author: Jens Neuhalfen Date: Sun May 8 18:17:48 2016 +0200
Prevent integration test timeout bc. of sudo
Signed-off-by: Jens Neuhalfen <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: http://article.gmane.org/gmane.network.openvpn.devel/11622
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering