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

Re: [PATCH/RFC] read-tree -m -u: do not overwrite or remove untracked working tree files.

From
Jakub Narebski <jnareb@gmail.com>
Date
May 17, 2006, 08:24 UTC
Message-ID
<e4emjq$73g$1@sea.gmane.org>
In-Reply-To
<7v8xp1jc9h.fsf_-_@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
Show 13 quoted lines
>   This is an RFC patch that I consider of somewhat dubious value.
>   Not the implementation quality, but the semantic change it
>   implies.  Before, we could freely work in a working tree, which
>   is just a scratch area to build the index, littered with
>   throw-away files, knowing they would not prevent merge between
>   our HEAD and other branch from happenning even if a merge needs
>   to blow them away.  With this change, it is not a case anymore.
>   Your merge will fail to proceed and you have to remove those
>   throw-away files yourself and retry the merge.  The extent of
>   the damage can be seen by the change to t1002 test this commit
>   contains.  It arguably is making things much safer by refusing to
>   proceed, so this might be a desirable change.  I am still
>   undecided.

Perhaps the behavior should be decided by the config option, e.g. core.preserveWorkingTree; of course that leave us with the problem what value should be the default: the one preserving backward compatibility, or the more safe one.

And of course --force to blow away changes anyway...
-- 
Jakub Narebski
Warsaw, Poland
Previous: Junio C Hamano
Message 10 of 10 in “Merge with local conflicts in new files”
  1. SantiMay 16, 2006
  2. SantiMay 16, 2006
  3. Junio C HamanoMay 16, 2006
  4. SantiMay 16, 2006
  5. Junio C HamanoMay 16, 2006
  6. Pavel RoskinMay 17, 2006
  7. Junio C HamanoMay 17, 2006
  8. Martin LanghoffMay 17, 2006
  9. read-tree -m -u: do not overwrite or remove untracked working tree files.Junio C Hamano, May 17, 2006
  10. Jakub NarebskiMay 17, 2006

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.