git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [bug report] git-am applying maildir patches in reverse

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 1, 2013, 22:27 UTC
Message-ID
<7vwqtqeox7.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20130301222018.GA839@WST420>
William Giokas <1007380@gmail.com> writes:
Show 26 quoted lines
> All,
>
> I've been using git for a while and this is the first time I've had to
> use `git am` and I've got a 16 patch patchset that I'm looking to apply.
> The files were copied to a separate maildir by mutt to keep things
> clean, and then I ran `git am -i /path/to/maildir/` expecting things to
> start from the patch with the subject 
>
>     [PATCH 01/16] refactor common code in query_search/sync_search
>
> But instead, it starts with the 16/16 patch and works backwards, which,
> obviously, breaks the application process as the patches depend on each
> other. I looked in the maildir directory just to see if the file names
> were backwards, and that's not the issue. I talked to `gitster` on IRC
> and he said to send in a bug report on this issue here. The patchset I'm
> trying to apply can be found here[0]. 
>
> Process to reproduce:
> * find a multi-patch set with interdependent patches
> * run `git am` on the maildir containing these patches
>
> Expected result:
> * Apply patches in [01..N] order
>
> Actual result:
> * Patches applied in [N N-1..01] order

Note to bystanders. This is coming from populate_maildir_list() in builtin/mailsplit.c; the function claims to know what "maildir" should look like, so it should be enforcing the ordering as necessary by sorting the list, _if_ the implicit ordering given by string_list_insert() is insufficient.

It also is likely that it is a user error to expect that patch e-mails are received and stored in the maildir in the order they were sent, or it could be "mutt" copying the mails in the order the messages were originally received, or something silly like that.

>
> [0]: https://mailman.archlinux.org/pipermail/pacman-dev/2013-March/016541.html
>
> Thank you,
Previous: William GiokasNext: Jeff King
Message 2 of 14 in “[bug report] git-am applying maildir patches in reverse”
  1. William GiokasMar 1, 2013
  2. Junio C HamanoMar 1, 2013
  3. Jeff KingMar 1, 2013
  4. Jeff KingMar 1, 2013
  5. Junio C HamanoMar 1, 2013
  6. Jeff KingMar 1, 2013
  7. Junio C HamanoMar 1, 2013
  8. Jeff KingMar 2, 2013
  9. Junio C HamanoMar 2, 2013
  10. Jeff KingMar 2, 2013
  11. Andreas SchwabMar 2, 2013
  12. Junio C HamanoMar 3, 2013
  13. Jeff KingMar 3, 2013
  14. Jeff KingMar 3, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.