discussion and development of piem
 help / color / mirror / code / Atom feed
* piem-am with multiple attached patches squashes the commits
@ 2024-04-14 20:21 Leo
  0 siblings, 0 replies; only message in thread
From: Leo @ 2024-04-14 20:21 UTC (permalink / raw)
  To: piem


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.



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2024-04-14 20:21 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-14 20:21 piem-am with multiple attached patches squashes the commits Leo

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).