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

getting git send-email patches from someone who is behind

From
Sandra Snan <sandra.snan@idiomdrottning.org>
Date
Dec 8, 2023, 17:50 UTC
Message-ID
<87h6ksk2hk.fsf@ellen.idiomdrottning.org>

I have a li'l git send-email question. Someone sent me a patch set of six patches today but they were not on most current main. I had to guess what version they were sending to so I could git am when I was on that particular version. I managed to sort it all out so this question is more for future reference.

Isn't there a way inside of the emails that it can show what version to apply the patches to?

Because now I was like "OK, I remember talking to them the other day and that means they probably are on what for me is HEAD^^" and that turned out to be correct, and sorting out the conflicts was also easy enough, but if I hadn't talked to them beforehand I would've been completely lost.

I asked another friend about it and he said:
> it's possible to record the base commit: 
> https://git-scm.com/docs/git-format-patch#_base_tree_information
> however, it's a bit finicky to do with git-send-email
I dunno.

I get that one of the fun parts about using patches instead of PRs is that you can be a li'l more loosey goosey about exactly what commit something is supposed to belong to but here I would've been completely lost because the patchset just borked horribly right from the first patch.

If others have run into this, what's the solution?
Next: Konstantin Ryabitsev
Message 1 of 3 in “getting git send-email patches from someone who is behind”
  1. Sandra SnanDec 8, 2023
  2. Konstantin RyabitsevDec 8, 2023
  3. Sandra SnanDec 8, 2023

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.