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

RFH: refactor read-tree

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jul 8, 2006, 22:28 UTC
Message-ID
<Pine.LNX.4.63.0607090015250.29667@wbgn013.biozentrum.uni-wuerzburg.de>
Hi,

the last thing to do with merge-recursive to speed it up, would be to avoid reading/writing the cache all the time.

Unfortunately, builtin-read-tree.c grew into a pretty big monster, with so many different options which completely change behaviour.

So, how should I go about it? Should I make a struct a la diff_options to hold the options to unpack_trees? Where should it go?

I also played a little with git-merge-tree, because it seems so much simpler and easier to refactor. But there is a problem: Either I call it the wrong way, or it does not yet work correctly: I tried

	git-merge-tree $(git-merge-base branch1 branch2) branch1 branch2

with what is in 'next'. But it only showed the _new_ files, not the modified ones.

Help, please?

Ciao, Dscho

Next: Linus Torvalds
Message 1 of 7 in “RFH: refactor read-tree”
  1. Johannes SchindelinJul 8, 2006
  2. Linus TorvaldsJul 9, 2006
  3. Alex RiesenJul 9, 2006
  4. Johannes SchindelinJul 9, 2006
  5. Linus TorvaldsJul 9, 2006
  6. Alex RiesenJul 9, 2006
  7. Johannes SchindelinJul 9, 2006

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.