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

Re: [PATCH 9/9] merge: use new "reset" function instead of running "git read-tree"

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 6, 2010, 00:03 UTC
Message-ID
<7vbpg3nsbd.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20100205231112.3689.34673.chriscool@tuxfamily.org>
Christian Couder <chriscool@tuxfamily.org> writes:
> This simplifies "git merge" code and make it more efficient in some
> cases.

I vaguely recall somebody (perhaps it was you) tried to do something like this before to drive unpack_trees() inside the main process, broke the program rather badly, and then we ended up keeping read-tree invocation external to the process. Am I misremembering things?

If not, could you describe how is this round different from the old one?
Previous: Christian CouderNext: Christian Couder
Message 17 of 20 in “add --ff option to cherry-pick”
  1. 0/9 add --ff option to cherry-pickChristian Couder, Feb 5, 2010
  2. 1/9 revert: libify cherry-pick and revert functionnalityChristian Couder, Feb 5, 2010
  3. 2/9 reset: refactor updating heads into a static functionChristian Couder, Feb 5, 2010
  4. 3/9 reset: refactor reseting in its own functionChristian Couder, Feb 5, 2010
  5. 4/9 reset: make reset function non static and declare it in "reset.h"Christian Couder, Feb 5, 2010
  6. 5/9 revert: add --ff option to allow fast forward when cherry-pickingChristian Couder, Feb 5, 2010
  7. Junio C HamanoFeb 5, 2010
  8. Junio C HamanoFeb 6, 2010
  9. Christian CouderFeb 28, 2010
  10. Paolo BonziniFeb 6, 2010
  11. Christian CouderFeb 6, 2010
  12. Paolo BonziniFeb 6, 2010
  13. 6/9 cherry-pick: add tests for new --ff optionChristian Couder, Feb 5, 2010
  14. 7/9 Documentation: describe new cherry-pick --ff optionChristian Couder, Feb 5, 2010
  15. 8/9 rebase -i: use new --ff cherry-pick optionChristian Couder, Feb 5, 2010
  16. 9/9 merge: use new "reset" function instead of running "git read-tree"Christian Couder, Feb 5, 2010
  17. Junio C HamanoFeb 6, 2010
  18. Christian CouderFeb 6, 2010
  19. Junio C HamanoFeb 5, 2010
  20. Christian CouderFeb 6, 2010

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.