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

Re: renaming a file into a directory causes a pull error on older repos

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 19, 2008, 06:31 UTC
Message-ID
<7vlk4f442u.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<20080319015156.GA8874@kroah.com>
Greg KH <greg@kroah.com> writes:
> I've tried to create a simple script to duplicate this problem, and I
> really can not do it at all, including trying to modify the file that
> got clobered by the directory name.  Odd.  I need to look at that repo
> and verify what I did to make sure it wasn't my fault here...
You might have noticed that I've tried it as well.

And it is never your fault. If git prevented you from trashing your local modifications, that is a good thing that it errored out.

Previous: Greg KH
Message 5 of 5 in “renaming a file into a directory causes a pull error on older repos”
  1. Greg KHMar 16, 2008
  2. Junio C HamanoMar 18, 2008
  3. git-merge-one-file: fix longstanding stupid thinkoJunio C Hamano, Mar 18, 2008
  4. Greg KHMar 19, 2008
  5. Junio C HamanoMar 19, 2008

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.