From: Erik Cervin Edin <erik@cervined.in>
To: Jeremy Morton <admin@game-point.net>
Cc: Chris Torek <chris.torek@gmail.com>, git@vger.kernel.org
Subject: Re: Proposal: tell git a file has been renamed
Date: Mon, 24 Apr 2023 12:49:19 +0200 [thread overview]
Message-ID: <CA+JQ7M-1YvZFzE_CtBQa5_eEXa1sPqK4xsTxdwpAQo_YcmW+-A@mail.gmail.com> (raw)
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.
>
> 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.
next prev parent reply other threads:[~2023-04-24 10:50 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-22 18:01 Proposal: tell git a file has been renamed Jeremy Morton
2023-04-22 18:54 ` rsbecker
2023-04-22 19:44 ` Jeremy Morton
2023-04-22 19:47 ` rsbecker
2023-04-22 19:54 ` Jeremy Morton
2023-04-22 22:09 ` rsbecker
2023-04-23 9:38 ` Erik Cervin Edin
2023-04-23 21:01 ` Kristoffer Haugsbakk
2023-04-24 1:43 ` Chris Torek
2023-04-24 10:10 ` Jeremy Morton
2023-04-24 10:24 ` Chris Torek
2023-04-24 10:49 ` Erik Cervin Edin [this message]
2023-04-24 11:17 ` Jeremy Morton
2023-04-24 14:00 ` Erik Cervin Edin
2023-04-24 14:42 ` Jeremy Morton
2023-04-24 19:25 ` Felipe Contreras
2023-04-24 19:44 ` Jacob Keller
2023-04-24 20:00 ` Felipe Contreras
2023-04-26 19:08 ` Jacob Keller
2023-04-26 20:39 ` Junio C Hamano
2023-05-11 13:44 ` Erik Cervin Edin
2023-04-24 18:26 ` Junio C Hamano
2023-04-24 19:41 ` Junio C Hamano
2023-04-24 20:05 ` Jeremy Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CA+JQ7M-1YvZFzE_CtBQa5_eEXa1sPqK4xsTxdwpAQo_YcmW+-A@mail.gmail.com \
--to=erik@cervined.in \
--cc=admin@game-point.net \
--cc=chris.torek@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).