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

Re: merge doesn't remove files

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
Feb 4, 2007, 10:40 UTC
Message-ID
<Pine.LNX.4.64.0702040234290.8424@woody.linux-foundation.org>
In-Reply-To
<20070204045933.GC16766@spearce.org>
On Sat, 3 Feb 2007, Shawn O. Pearce wrote:
> 
> But that tree-ish doesn't have to be the first non-base
> argument to merge-recursive, does it?  In practice it usually is,
> but can I assume it in the code?

Yes, the first branch is supposed to be the "current" one. That's the one we compare to the index, and that we should already error out on if the index doesn't match the tree. So yeah, a file should ever be removed only if it existed in the old index (and by implication in the first branch, since otherwise we should have failed the merge as not having a clean tree anyway).

		Linus
Previous: Shawn O. PearceNext: Shawn O. Pearce
Message 5 of 6 in “merge doesn't remove files”
  1. Gerrit PapeFeb 3, 2007
  2. Junio C HamanoFeb 4, 2007
  3. Junio C HamanoFeb 4, 2007
  4. Shawn O. PearceFeb 4, 2007
  5. Linus TorvaldsFeb 4, 2007
  6. Shawn O. PearceFeb 4, 2007

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.