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

Re: Please undo "Use git-merge instead of git-resolve in git-pull"

From
Linus Torvalds <torvalds@osdl.org>
Date
Sep 22, 2005, 02:10 UTC
Message-ID
<Pine.LNX.4.58.0509211902010.2553@g5.osdl.org>
In-Reply-To
<46a038f905092118464b98e149@mail.gmail.com>
On Thu, 22 Sep 2005, Martin Langhoff wrote:
>
> Using Cogito, we've found a couple of cases where merging on a dirty
> tree messed things up. The local changes were lost after the merge.

Hmm. I merge a ton of stuff, and as mentioned, I probably have a dirty tree at least half the time. I don't think I've seen a problem yet.

But cogito at least _used_ to have some special logic for moving patches forward. git-resolve-script never had that - it only ever did the per-file three-way merge, and refused to touch dirty state except for the "everything stays the same" case.

Oh. I'm looking at the current cg-merge thing, and I think I see the problem: it's doing

	git-checkout-index -f -u -a

at the end. That's not only unnecessary, since it uses the "-u" flag to "git-read-tree", but it will force an overwrite of the working tree, and is thus actively incorrect.

Pasky?
		Linus
Previous: Martin LanghoffNext: Petr Baudis
Message 9 of 10 in “Please undo "Use git-merge instead of git-resolve in git-pull"”
  1. Linus TorvaldsSep 21, 2005
  2. Linus TorvaldsSep 21, 2005
  3. Junio C HamanoSep 21, 2005
  4. Linus TorvaldsSep 21, 2005
  5. David S. MillerSep 22, 2005
  6. Linus TorvaldsSep 22, 2005
  7. Olivier GalibertSep 22, 2005
  8. Martin LanghoffSep 22, 2005
  9. Linus TorvaldsSep 22, 2005
  10. Petr BaudisSep 23, 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.