From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= Subject: Re: Patchwork + automated checking and testing of patches Date: Fri, 8 Feb 2019 19:54:33 +0100 Message-ID: <20190208195433.704c93d3@alma-ubu> References: <87h8h29z2j.fsf@cbaines.net> <87sgx71xg8.fsf@cbaines.net> <87pns7p7x6.fsf@gnu.org> <87lg2q5vwb.fsf@cbaines.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/aQSLN/cLKFya2Rhc_VGEZ5r"; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([209.51.188.92]:60250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gsCaH-0001T4-Sz for guix-devel@gnu.org; Fri, 08 Feb 2019 15:17:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gsCaD-0000dC-Hc for guix-devel@gnu.org; Fri, 08 Feb 2019 15:17:11 -0500 Received: from m4s11.vlinux.de ([83.151.27.109]:60202 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gsCaC-0007sN-KY for guix-devel@gnu.org; Fri, 08 Feb 2019 15:17:09 -0500 In-Reply-To: <87lg2q5vwb.fsf@cbaines.net> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Christopher Baines Cc: Guix-devel --Sig_/aQSLN/cLKFya2Rhc_VGEZ5r Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Fri, 08 Feb 2019 12:04:20 +0000 Christopher Baines wrote: > Thanks, however, one thing I've noticed is that git apply seems to be > much more reliable at applying patches than git am. It often fails > with "Patch is empty". >=20 > I'm not sure why, it seems to work for the patches I've sent with git > send-email, but maybe it's very particular about the formatting... Maybe you already thought about it, but: When I use it manually, I save the whole patch-series as an mbox-file, including the "--cover-letter", i.e. the first email saying [0/n]. When I then say "git am patch.mbox" it complains there is nothing in. I then have to say "git am --skip" and it goes on automatically. Could that also be the case with your patchwork-setup? Bj=C3=B6rn --Sig_/aQSLN/cLKFya2Rhc_VGEZ5r Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXF3QaQAKCRC/KGy2WT5f /YDIAJ0bVVihCfDH3RgAqjGf+GpDLNloiACdHQXWtel7CgumMAgb+7bkPbbHBuw= =MYX9 -----END PGP SIGNATURE----- --Sig_/aQSLN/cLKFya2Rhc_VGEZ5r--