unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Michael Albinus <michael.albinus@gmx.de>
To: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Cc: 66450@debbugs.gnu.org, Eric Abrahamsen <eric@ericabrahamsen.net>,
	Bruno Victal <mirai@makinata.eu>
Subject: bug#66450: 29.1; Debbugs/Gnus sometimes corrupt git formatted patches
Date: Thu, 12 Oct 2023 18:52:36 +0200	[thread overview]
Message-ID: <87o7h3g4vf.fsf@gmx.de> (raw)
In-Reply-To: <87y1gafi0n.fsf@gmail.com> (Maxim Cournoyer's message of "Tue, 10 Oct 2023 14:29:28 -0400")

Maxim Cournoyer <maxim.cournoyer@gmail.com> 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.





  parent reply	other threads:[~2023-10-12 16:52 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-10 18:29 bug#66450: 29.1; Debbugs/Gnus sometimes corrupt git formatted patches Maxim Cournoyer
2023-10-11 20:37 ` Eric Abrahamsen
2023-10-14 15:22   ` Maxim Cournoyer
2023-10-14 15:35     ` Maxim Cournoyer
2023-10-14 16:43     ` Eric Abrahamsen
2023-10-12 16:52 ` Michael Albinus [this message]
2023-10-12 22:04   ` Eric Abrahamsen
2023-10-13  7:01     ` Michael Albinus
2023-10-13 16:53       ` Eric Abrahamsen
2023-10-14 14:41         ` Michael Albinus
2023-10-14 16:40           ` Eric Abrahamsen
2023-10-16 14:59           ` Maxim Cournoyer
2023-10-17  7:03             ` Michael Albinus
2023-10-17 14:06               ` Eric Abrahamsen
2023-10-17 15:19                 ` Maxim Cournoyer
2023-10-17 16:41                   ` Eric Abrahamsen
2023-10-18 18:50                     ` Maxim Cournoyer
2023-10-18 19:40                       ` Eric Abrahamsen
2023-10-19  1:01                         ` Maxim Cournoyer
2023-10-19  2:50                           ` Eric Abrahamsen
2023-10-19  3:38                             ` Maxim Cournoyer
2023-10-19  6:26                         ` Visuwesh
2024-03-10 15:12                         ` Eric Abrahamsen
2023-10-19  1:53               ` Maxim Cournoyer
2023-10-19  7:05                 ` Michael Albinus
2023-10-14 20:27         ` Björn Bidar via Bug reports for GNU Emacs, the Swiss army knife of text editors
     [not found]         ` <875y390x1s.fsf@>
2023-10-15  1:13           ` Eric Abrahamsen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87o7h3g4vf.fsf@gmx.de \
    --to=michael.albinus@gmx.de \
    --cc=66450@debbugs.gnu.org \
    --cc=eric@ericabrahamsen.net \
    --cc=maxim.cournoyer@gmail.com \
    --cc=mirai@makinata.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).