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

Re: [PATCH 0/2] Reorganize read-tree

From
Daniel Barkalow <barkalow@iabervon.org>
Date
Aug 31, 2005, 17:04 UTC
Message-ID
<Pine.LNX.4.63.0508311257480.23242@iabervon.org>
In-Reply-To
<tnxy86ikxan.fsf@arm.com>
On Wed, 31 Aug 2005, Catalin Marinas wrote:
Show 12 quoted lines
> Daniel Barkalow <barkalow@iabervon.org> wrote:
> > I got mostly done with this before Linus mentioned the possibility of
> > having multiple index entries in the same stage for a single path. I
> > finished it anyway, but I'm not sure that we won't want to know which of
> > the common ancestors contributed which, and, if some of them don't have a
> > path, we wouldn't be able to tell.
> 
> I don't have time to look at the patch and I don't have a good
> knowledge of the GIT internals, so I will just ask. Does this patch
> changes the call convention for git-merge-one-file-script? I have my
> own script for StGIT and I would need to know whether it is affected
> or not.

Nope, it only changes the trivial merge calling convention within read-tree.c; I think it's plausible that we might like to add information at some point, but the short-term goal is just to prevent a few bad cases in trivial merges.

Previous: Catalin MarinasNext: Daniel Barkalow
Message 7 of 11 in “Reorganize read-tree”
  1. 0/2 Reorganize read-treeDaniel Barkalow, Aug 31, 2005
  2. 1/2 Object model additions for read-treeDaniel Barkalow, Aug 31, 2005
  3. Change read-tree to merge before using the index.Daniel Barkalow, Aug 31, 2005
  4. Junio C HamanoAug 31, 2005
  5. Daniel BarkalowAug 31, 2005
  6. Catalin MarinasAug 31, 2005
  7. Daniel BarkalowAug 31, 2005
  8. 1/2 Object model additions for read-treeDaniel Barkalow, Aug 31, 2005
  9. 2/2 Change read-tree to merge before using the index.Daniel Barkalow, Aug 31, 2005
  10. Junio C HamanoSep 5, 2005
  11. Daniel BarkalowSep 5, 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.