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

Re: Rename handling

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
Mar 21, 2007, 23:10 UTC
Message-ID
<Pine.LNX.4.64.0703211607120.6730@woody.linux-foundation.org>
In-Reply-To
<Pine.LNX.4.63.0703212341020.22628@wbgn013.biozentrum.uni-wuerzburg.de>
On Thu, 22 Mar 2007, Johannes Schindelin wrote:
> 
> That is a particularly bad example: you are not renaming files in that 
> example!
Well, yes and no.
I would actually say that it si a particularly *good* example.

With git, you can actually record renames exactly this way: you just need to make sure that you don't change the content, and you make it two independent commits.

That is in fact how some systems that support "explicit renames" actually do it: the rename is literally a separate option, and cannot necessarily go together with other actions (in particular, several file-ID-following systems do not allow "cross-renames" in the same commit, for example, and you actually have to do them as two separate commits).

Git *allows* you to do renames with changes. In fact, I'd normally encourage it. But it doesn't force it, and then renames are totally unambiguos except for the case where you simply have the *same*file* in multiple places, and you remove or add multiple copies (again, you can do that unambiguously too, if you limit it to *one* such rename per commit)

		Linus
Previous: Johannes SchindelinNext: Martin Langhoff
Message 22 of 31 in “Rename handling”
  1. John GoerzenMar 19, 2007
  2. Steven GrimmMar 19, 2007
  3. Nicolas PitreMar 19, 2007
  4. Linus TorvaldsMar 19, 2007
  5. Steven GrimmMar 19, 2007
  6. Martin LanghoffMar 19, 2007
  7. Junio C HamanoMar 20, 2007
  8. Linus TorvaldsMar 19, 2007
  9. Robin RosenbergMar 19, 2007
  10. Linus TorvaldsMar 19, 2007
  11. Steven GrimmMar 19, 2007
  12. Steven GrimmMar 19, 2007
  13. Linus TorvaldsMar 19, 2007
  14. Nicolas PitreMar 19, 2007
  15. Daniel BarkalowMar 19, 2007
  16. Andy ParkinsMar 19, 2007
  17. Steven GrimmMar 19, 2007
  18. Jakub NarebskiMar 21, 2007
  19. Johannes SchindelinMar 21, 2007
  20. Steven GrimmMar 21, 2007
  21. Johannes SchindelinMar 21, 2007
  22. Linus TorvaldsMar 21, 2007
  23. Martin LanghoffMar 22, 2007
  24. Jakub NarebskiMar 22, 2007
  25. Martin LanghoffMar 22, 2007
  26. Jakub NarebskiMar 22, 2007
  27. Linus TorvaldsMar 22, 2007
  28. Daniel BarkalowMar 19, 2007
  29. John GoerzenMar 19, 2007
  30. Junio C HamanoMar 19, 2007
  31. Jakub NarebskiMar 21, 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.