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

Re: What's new in git.git master branch

From
Fredrik Kuivinen <freku045@student.liu.se>
Date
Dec 2, 2005, 08:36 UTC
Message-ID
<20051202083652.GA4824@c165.ib.student.liu.se>
In-Reply-To
<7vmzjljgwo.fsf@assigned-by-dhcp.cox.net>
On Thu, Dec 01, 2005 at 01:38:47AM -0800, Junio C Hamano wrote:
Show 9 quoted lines
> Currently, rename result is recorded by using "git-update-index
> --cacheinfo" to populate the index.  This method unfortunately
> can only create a stage0 entry.  We can go two ways.  One way is
> to support "register this mode/sha1 tuple at stageN for path" to
> update-index.  Another would be for merge-recursive to first
> construct three trees with the final directory structure
> (i.e. prepare three temporary trees with renames applied) and
> run read-tree 3-way merge on these temporary trees.  I suspect
> the former is probably of lesser impact.  Thoughts?

If we really want to do this then the former is certainly easier from the perspective of git-merge-recursive.

- Fredrik
Previous: Fredrik KuivinenNext: Junio C Hamano
Message 7 of 15 in “What's new in git.git master branch”
  1. Junio C HamanoNov 30, 2005
  2. Fredrik KuivinenDec 1, 2005
  3. Junio C HamanoDec 1, 2005
  4. Junio C HamanoDec 2, 2005
  5. Junio C HamanoDec 2, 2005
  6. Fredrik KuivinenDec 2, 2005
  7. Fredrik KuivinenDec 2, 2005
  8. 3/3 update-index: allow --index-info to add higher stages.Junio C Hamano, Dec 7, 2005
  9. git-ls-tree: add "-t" option to always show the tree entriesLinus Torvalds, Dec 1, 2005
  10. Junio C HamanoDec 1, 2005
  11. Linus TorvaldsDec 1, 2005
  12. Junio C HamanoDec 1, 2005
  13. ls-tree: --name-onlyJunio C Hamano, Dec 1, 2005
  14. Junio C HamanoDec 2, 2005
  15. Linus TorvaldsDec 2, 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.