From: Leo <git@relevant-information.com>
To: piem@inbox.kyleam.com
Subject: piem-am with multiple attached patches squashes the commits
Date: Sun, 14 Apr 2024 22:21:34 +0200 [thread overview]
Message-ID: <8734rnlmpd.fsf@> (raw)
I'm writing this as I've observed this presumably unintended behaviour
once. If you need more info I can try to reproduce in a more controlled
environment.
I got an email with a patch series with two commits, as attachments to a
single email. Something like this in notmuch:
[ 0001-first-patch.patch: text/x-patch (hidden) ]
[ 0002-second-patch.patch: text/x-patch (hidden) ]
I called piem-am on this, which managed to apply the patches.
However, this resulted in a single commit with the commit message of the
first patch, but the changes of both patches combined.
The value of piem-am-ready-mbox-functions was set to piem-notmuch-am-ready-mbox
I then tried calling notmuch-show-pipe-part with the command "git am" on
each attachment. That successfully applied the patches correctly. I
also diffed the two branches and got no differences, just to make sure
that all the changes came through with both methods.
reply other threads:[~2024-04-14 20:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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://git.kyleam.com/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8734rnlmpd.fsf@ \
--to=git@relevant-information.com \
--cc=piem@inbox.kyleam.com \
/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.kyleam.com/piem/
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).