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

Re: [PATCH] do not overwrite untracked symlinks

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 22, 2011, 20:01 UTC
Message-ID
<7vzkpnbzyr.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20110222192632.GB4881@localhost>
Clemens Buchacher <drizzd@aon.at> writes:
Show 7 quoted lines
> I strongly feel that we should separate the merge process into two
> steps.
>
>  - First, do everything in the index, ignoring the work tree.
>
>  - Second, checkout the index to the work tree while making sure no
>    changes or untracked files get overwritten.

Yes, I think most people who are familiar with the internals agreed on this long time ago.

> ... But I can't
> get myself to feel good about fixing the function name, but not the
> function.
I think I said what I wanted to say badly.

I agree that the code structure is suboptimal; the badly named function is just a manifestation of the fact that the abstraction used in the codepaths involved is not a good one, I think.

Previous: Clemens BuchacherNext: Johannes Sixt
Message 13 of 14 in “untracked symlinks are less precious than untracked files?”
  1. Johannes SixtFeb 2, 2011
  2. Junio C HamanoFeb 2, 2011
  3. Johannes SixtFeb 2, 2011
  4. Demonstrate breakage: checkout overwrites untracked symlink with directoryJohannes Sixt, Feb 5, 2011
  5. Clemens BuchacherFeb 5, 2011
  6. Junio C HamanoFeb 9, 2011
  7. Clemens BuchacherFeb 10, 2011
  8. do not overwrite untracked symlinksClemens Buchacher, Feb 20, 2011
  9. Junio C HamanoFeb 21, 2011
  10. Clemens BuchacherFeb 21, 2011
  11. Junio C HamanoFeb 22, 2011
  12. Clemens BuchacherFeb 22, 2011
  13. Junio C HamanoFeb 22, 2011
  14. Johannes SixtFeb 15, 2011

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.