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

Re: Proposal: tell git a file has been renamed

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 24, 2023, 19:41 UTC
Message-ID
<xmqq8rehdq4m.fsf@gitster.g>
In-Reply-To
<8fe188a9-c01f-9fb5-5877-8ff508094b22@game-point.net>
Jeremy Morton <admin@game-point.net> writes:
> The standard answer for this is to rename the file in one commit, then
> make the changes.

Oh, by the way, this is a pure myth that would unlikely be helpful in the bigger picture.

When you rename and heavily modify the resulting new path because you have to solve something, such a work would likely be done on the same topic branch. One step of it may be a pure rename, and other steps may involve heavily changing the renamed result, or you may update the contents in the original and the do a rename at the end, but either way, when you integrate the end result of the whole topic branch into the master history, what such a merge will see is that the original file has disappeared and a new file with contents not at all similar to the disappeared file has appeared. "pure rename with changes in separate commits" would have no effect when showing such a history with "git log --first-parent -p" for a birds-eye view.

Previous: Junio C HamanoNext: Jeremy Morton
Message 23 of 24 in “Proposal: tell git a file has been renamed”
  1. Jeremy MortonApr 22, 2023
  2. rsbecker@nexbridge.comApr 22, 2023
  3. Jeremy MortonApr 22, 2023
  4. rsbecker@nexbridge.comApr 22, 2023
  5. Jeremy MortonApr 22, 2023
  6. rsbecker@nexbridge.comApr 22, 2023
  7. Erik Cervin EdinApr 23, 2023
  8. Kristoffer HaugsbakkApr 23, 2023
  9. Chris TorekApr 24, 2023
  10. Jeremy MortonApr 24, 2023
  11. Chris TorekApr 24, 2023
  12. Erik Cervin EdinApr 24, 2023
  13. Jeremy MortonApr 24, 2023
  14. Erik Cervin EdinApr 24, 2023
  15. Jeremy MortonApr 24, 2023
  16. Felipe ContrerasApr 24, 2023
  17. Jacob KellerApr 24, 2023
  18. Felipe ContrerasApr 24, 2023
  19. Jacob KellerApr 26, 2023
  20. Junio C HamanoApr 26, 2023
  21. Erik Cervin EdinMay 11, 2023
  22. Junio C HamanoApr 24, 2023
  23. Junio C HamanoApr 24, 2023
  24. Jeremy MortonApr 24, 2023

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.