piem-am with multiple attached patches squashes the commits

piem-am with multiple attached patches squashes the commits

[Leo]

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.

Re: piem-am with multiple attached patches squashes the commits

[Kyle Meyer]

Thanks for the report, and sorry for the very delayed reply.

Leo writes:

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

Odd.  I'm not able to trigger that behavior on my end, so any additional
info for reproducing would be helpful (though, if you're not hitting
into this regularly, I realize these details may be lost to time at this
point).

Re: piem-am with multiple attached patches squashes the commits

[Leo]

Kyle Meyer <kyle@kyleam.com> writes:

> Thanks for the report, and sorry for the very delayed reply.
>

Thank you for replying!  When I dug up the email that triggered this I
I found some work that I hadn't finished. 😅

>
> Odd.  I'm not able to trigger that behavior on my end, so any additional
> info for reproducing would be helpful (though, if you're not hitting
> into this regularly, I realize these details may be lost to time at this
> point).

I found the email that prompted this report.  I tried running `piem-am`
on it again, and I could observe the same behaviour as described
earlier.  I also tried to reproduce it with a minimum viable example in
a new repo, but then the expected behaviour occurred.  I can't really
find any meaningful difference between the two so I'm giving up for now.
Maybe someone else will encounter this again in the future.  I haven't
run into this since (and had honestly forgotten that the problem existed).

Cheers,
Leo