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

Re: Proposal: tell git a file has been renamed

From
EEErik Cervin Edin <erik@cervined.in>
Date
Apr 24, 2023, 10:49 UTC
Message-ID
<CA+JQ7M-1YvZFzE_CtBQa5_eEXa1sPqK4xsTxdwpAQo_YcmW+-A@mail.gmail.com>
In-Reply-To
<74a361fd-4ee6-f362-8d49-92417f0e2dac@game-point.net>
On Mon, Apr 24, 2023 at 12:21 PM Jeremy Morton <admin@game-point.net> wrote:
>
> I'm surprised --follow isn't the default, actually... isn't the whole
> point of detecting renames to allow content history to be tracked back
> through renames?
You can set log to --follow by default
  If true, git log will act as if the --follow option was used when a
single <path> is given.
  This has the same limitations as --follow, i.e. it cannot be used to
follow multiple files
  and does not work well on non-linear history.
  https://git-scm.com/docs/git-log#Documentation/git-log.txt-logfollow
The reason it's not default is probably those limitations.
Show 5 quoted lines
>
> Another one that jumped to mind for me is bisect.  As rename-only
> commits are liable to create broken builds, it should skip over them
> to the 'content' commit.
>

I always find this to be the main dilemma. I try to make commits as discrete changes but it's not always possible with renames. Sometimes, renaming a file changes it so much that the rename detection doesn't work by default. There are also other problems that arise when reordering commits and changes in a feature branch. I've found that the safest thing is to split renames out into discrete commits and only do 100% renames.

Previous: Chris TorekNext: Jeremy Morton
Message 12 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.