From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.bugs Subject: bug#66450: 29.1; Debbugs/Gnus sometimes corrupt git formatted patches Date: Thu, 12 Oct 2023 18:52:36 +0200 Message-ID: <87o7h3g4vf.fsf@gmx.de> References: <87y1gafi0n.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35550"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 66450@debbugs.gnu.org, Eric Abrahamsen , Bruno Victal To: Maxim Cournoyer Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Oct 12 18:53:57 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qqywf-000945-3l for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 12 Oct 2023 18:53:57 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qqywR-0001N8-PT; Thu, 12 Oct 2023 12:53:43 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qqywN-0001JJ-SM for bug-gnu-emacs@gnu.org; Thu, 12 Oct 2023 12:53:40 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqywN-0005rU-J6 for bug-gnu-emacs@gnu.org; Thu, 12 Oct 2023 12:53:39 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qqywj-0003sW-Ls for bug-gnu-emacs@gnu.org; Thu, 12 Oct 2023 12:54:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Michael Albinus Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 12 Oct 2023 16:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66450 X-GNU-PR-Package: emacs Original-Received: via spool by 66450-submit@debbugs.gnu.org id=B66450.169712960614867 (code B ref 66450); Thu, 12 Oct 2023 16:54:01 +0000 Original-Received: (at 66450) by debbugs.gnu.org; 12 Oct 2023 16:53:26 +0000 Original-Received: from localhost ([127.0.0.1]:44202 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqywA-0003ri-DY for submit@debbugs.gnu.org; Thu, 12 Oct 2023 12:53:26 -0400 Original-Received: from mout.gmx.net ([212.227.15.18]:35835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqyw5-0003rS-Tu for 66450@debbugs.gnu.org; Thu, 12 Oct 2023 12:53:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1697129557; x=1697734357; i=michael.albinus@gmx.de; bh=opEdQOK9FGTCd8JiRLpnSThD6TILzQrqskufHFYvVtA=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date; b=isl+HZkE/ka4ijE/bcDqhQ6lBNobojMhqfjC1sUi0H0oIgZgttzxnpnsGon1IyQgFY2Qrtj1JDD 2tqTOJyyP5aL2zFIlLje70HGPniEuHdLvCGO46xtLHDpwhOMX3VgNEz1cIbNcvFcn0DbTqWQRlTcf 8HAwQBARkKsSMDJSun/2avVWy5+tlxDkRCM4GiC7Ix6pRjCMw8SKdVHF7geFc9jaY9hZVG7UGS5vL P83H8STHEwtPgODX6EYjjjVFIB8Xdsg3EwfZYB7RrnRX1lFyPC6wAdqOfbIsmrlOjyIwUK1ZGhdgG iSdYB2Bk3gSGTRqZVOMoOtUIcwf/j2QliR1w== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from gandalf.gmx.de ([185.89.39.30]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N0oBr-1rnm0O3AFZ-00wnHb; Thu, 12 Oct 2023 18:52:37 +0200 In-Reply-To: <87y1gafi0n.fsf@gmail.com> (Maxim Cournoyer's message of "Tue, 10 Oct 2023 14:29:28 -0400") X-Provags-ID: V03:K1:9xRObVA48uW188UlZDeksifxpuzHVhsdvCidv+S3xtGNVrfKp3r QD45mCQ2gu37k2We3h5aqgzam9G0PTG48rXPfL96yUi/PbqIkHTIk1S6+9/P5XgJjqFcd/0 vRiYtQlY/MF2A65kakjV/YAvp4SQysmdoaClYRH2hzmLkne6oF0VnwVqabZ+L7GmRxUVBk6 pcNqRRD2A7zQ/RDiLucWw== UI-OutboundReport: notjunk:1;M01:P0:si4iV3Kj5o0=;xPaYOPKDMuGVyzjIvY472pgFrAa VtsEQCbFODqGqCzGeSy98l2jtmcbVD7K7Abi1zZMZ4iBv45DicVXsUSFhm/bZBQM+5Q6JxojD QWw1qf1KtrRREMG0aMz+Et8Dbvni5OO3MP5lEe8Kok3pacxKHKMx9mhNSlHPRc1IxNlyugnpE ZlhmmmyqJH0dByoNk48mntlfmCM/Fs/9+KMxcgJkdhG5g39bsqRkdnHFITco37vLDKx+71yPi FRa5LUFA4QZqNE5JFwf5pZaaqYGMmUmf64Qq5En8MvenCwKGzApfp1JP5mk54TbcvGKtLGwKq rkEiHF3Aqs8XvwSUgfUzN2zFajJJw4KhiJYEOYPpnml9Bdy1uOn0QsuEC4MD8BY193QtDfP6I GiMEn4pMo8aKjNTVvuuQ+4kMI/MmkT/P+Uzj7pJXw6UezxXfquqlp4j1l58x0Gf3toDsbwEHA HKeaYgfSFH5UCHemxT3A6cWgkbfntUY7YfRkQxtL+mn4+3FtzuMjc362ngL7j/ucMv1MoouZk M/F7vlOQzyGa3BmRQfF/zc5HelPIf51rfR4KJP7xaLzhPu08nX9CIvbb4KvaaPBSReo74ZlX4 bHfnfNFMTg4tmydJbM8t3LK0ls20SYsO6uRnsQqrA5e1biPDHWPZv5gG5gCo/2UY5yV4jl8Xm Tfi2oSmQDUdI0K8yBvdgXdM7X0aAXbgX2yu4Aed3K6TsEMYeFs26ZREjLFKra6NVG/VYifIG5 av4oxLAB8u0ev3jBQn04kQ3G/qW59uJTP/vEAj0+zliEf+3inHW0Dqyz40J5ZAyudfa5KcI1 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:272311 Archived-At: Maxim Cournoyer writes: > Hello, Hi Maxim, > While working via Emacs Debbugs, I noticed that applying a patch would > fail, and that this only occurred when fetching and saving the patch via > Debbugs/Gnus. Below is a reproducer: > > 1. mkdir -p src && cd src && git clone https://git.savannah.gnu.org/git/guix.git > 2. cd guix && git checkout core-updates > 3. in emacs: M-x debbugs-gnu-bugs RET 65479 RET > 4. Navigate to the message with [PATCH core-updates v3 10/63] in its > subject > 5. M-x cd RET ~/src/guix > 6. Try to apply the patch by pressing: | RET git am > 7. Notice that it fails with a patch corrupted message > 8. Save the patch message to a file via: O f /tmp/bad.txt > 9. Save a pristine version from Mumi: > wget https://issues.guix.gnu.org/issue/65479/raw/164 -O/tmp/good.txt > > 10. From your shell in the Guix checkout: git am --abort; git am < > /tmp/bad.txt > Observe: > > Applying: gnu: docbook: Remove leftovers. > error: corrupt patch at line 97 > Patch failed at 0001 gnu: docbook: Remove leftovers. > hint: Use 'git am --show-current-patch=diff' to see the failed patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > > > 11. git am --abort; git am < /tmp/good.txt > > It'll fail also because we haven't applied patches 1 to 9, but note the > error is not about a corrupted patch. Eric has told you already what's up from gnus pov. The debbugs manual gives you a further approach: debbugs-gnu-apply-patch (M-m). Read it at (info "(debbugs-ug) Applying Patches") The documentation speaks about the Emacs repository, but I believe it should be possible also to apply it to GUIX with proper setting of debbugs-gnu-trunk-directory. If not pls tell me; we could adapt it then. There is, for example, a minibuffer prompt "Emacs repository location: " which should work anyway. Best regards, Michael.