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

Re: Patch (apply) vs. Pull

From
Junio C Hamano <junkio@cox.net>
Date
Jun 22, 2005, 09:08 UTC
Message-ID
<7vmzpihi6x.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.58.0506211452110.2353@ppc970.osdl.org>
>>>>> "LT" == Linus Torvalds <torvalds@osdl.org> writes:

LT> and here the "git-cherry-pick" thing is just a script that basically takes LT> an old commit ID, and tries to re-apply it as a patch (with author data LT> and commit messages, of course) on top of the current head. It would LT> basically be nothing more than a "git-diff-tree $1" followed by tryign to LT> figure out whether it had already been applied or whether it can be LT> applied now.

LT> What do you think?

What you outlined is essentially what I already do by using jit-rewind, followed by a repeated use of (jit-patch and jit-commit with -m flag). The reason I have not automated the "repeat" part is _not_ because I am lazy, but because typically the rejected things really need manual intervention, not for mechanical (read: merge conflict) reasons, but for semantic reasons, when some patches are accepted while some others are not. Especially if I am not the sole supplier of patches to your tree, my older patches usually need not just rebasing but _rethinking_, so I myself do not find need for automating things further that much from what I already have.

Having said that, one automation I would benefit from is to automatically find patches that _have_ been accepted and drop them from my snapshot pool --- that part should be very easy to automate and I have not done so primarily because I _am_ lazy. I could call it git-cherry-drop ;-).

Previous: Linus TorvaldsNext: Linus Torvalds
Message 8 of 33 in “Patch (apply) vs. Pull”
  1. Darrin ThompsonJun 20, 2005
  2. Junio C HamanoJun 20, 2005
  3. Darrin ThompsonJun 20, 2005
  4. Daniel BarkalowJun 21, 2005
  5. Junio C HamanoJun 22, 2005
  6. Catalin MarinasJun 22, 2005
  7. Linus TorvaldsJun 21, 2005
  8. Junio C HamanoJun 22, 2005
  9. Linus TorvaldsJun 22, 2005
  10. Daniel BarkalowJun 22, 2005
  11. Linus TorvaldsJun 22, 2005
  12. Daniel BarkalowJun 22, 2005
  13. Linus TorvaldsJun 22, 2005
  14. Daniel BarkalowJun 23, 2005
  15. Linus TorvaldsJun 23, 2005
  16. Daniel BarkalowJun 23, 2005
  17. Linus TorvaldsJun 23, 2005
  18. Daniel BarkalowJun 23, 2005
  19. Linus TorvaldsJun 23, 2005
  20. Daniel BarkalowJun 23, 2005
  21. Linus TorvaldsJun 23, 2005
  22. Linus TorvaldsJun 23, 2005
  23. Catalin MarinasJun 23, 2005
  24. Daniel BarkalowJun 23, 2005
  25. Catalin MarinasJun 24, 2005
  26. Martin LanghoffJun 23, 2005
  27. Darrin ThompsonJun 22, 2005
  28. Martin LanghoffJun 23, 2005
  29. 0/3 Rebasing for "individual developer" usageJunio C Hamano, Jun 23, 2005
  30. 1/3 git-commit-script: get commit message from an existing one.Junio C Hamano, Jun 23, 2005
  31. 2/3 git-cherry: find commits not merged upstream.Junio C Hamano, Jun 23, 2005
  32. 3/3 git-rebase-script: rebase local commits to new upstream head.Junio C Hamano, Jun 23, 2005
  33. Catalin MarinasJun 22, 2005

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.