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

Re: [RFH] straightening out "read-tree -m"

From
Brian Gernhardt <benji@silverinsanity.com>
Date
Mar 18, 2007, 16:06 UTC
Message-ID
<16CD10D5-3BDA-4DFE-A8C6-96D48F511824@silverinsanity.com>
In-Reply-To
<20070318121810.GA17807@moooo.ath.cx>
On Mar 18, 2007, at 8:18 AM, Matthias Lederhofer wrote:
Show 14 quoted lines
> Junio C Hamano <junkio@cox.net> wrote:
>> A	B	Outcome
>> ----------------------------------------------------------------
>> D	D	No problem.
>>
>> D	F	This should result in refusal when there are
>>                 local modification to paths in "foo" directory,
>> 		or there are untracked (but unignored) paths in
>>                 "foo/".
>
> What about ignored configuration files like config.mak?
> Let's say there is an ignored configuration file in a subdirectory.
> If this subdirectory is replaced by a file git would delete the
> ignored configuration file?

I would sincerely hope that a file not being tracked by git would count as "local modifications" in that case. "Ignored" does not mean "unimportant".

My $0.02, ~~ Brian

Previous: Matthias LederhoferNext: Junio C Hamano
Message 3 of 6 in “[RFH] straightening out "read-tree -m"”
  1. Junio C HamanoMar 18, 2007
  2. Matthias LederhoferMar 18, 2007
  3. Brian GernhardtMar 18, 2007
  4. Junio C HamanoMar 18, 2007
  5. Steven GrimmMar 18, 2007
  6. Junio C HamanoMar 19, 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.