From: Jeremy Morton <admin@game-point.net>
To: rsbecker@nexbridge.com, git@vger.kernel.org
Subject: Re: Proposal: tell git a file has been renamed
Date: Sat, 22 Apr 2023 20:54:28 +0100 [thread overview]
Message-ID: <3ac19159-7314-c299-5112-b0f7aa2cc409@game-point.net> (raw)
In-Reply-To: <01ce01d97553$4361f990$ca25ecb0$@nexbridge.com>
https://stackoverflow.com/a/1094392/178757
says:
git mv oldname newname
is just shorthand for:
mv oldname newname
git add newname
git rm oldname
--
Best regards,
Jeremy Morton (Jez)
On 22/04/2023 20:47, rsbecker@nexbridge.com wrote:
> No, history is preserved in the rename.
>
>> -----Original Message-----
>> From: Jeremy Morton <admin@game-point.net>
>> Sent: Saturday, April 22, 2023 3:45 PM
>> To: rsbecker@nexbridge.com; git@vger.kernel.org
>> Subject: Re: Proposal: tell git a file has been renamed
>>
>> I read that git mv is basically the equivalent to deleting the old file, creating the new
>> file, and adding the changes. Isn't it? If so it's gonna have the same problem as I
>> have now.
>>
>> --
>> Best regards,
>> Jeremy Morton (Jez)
>>
>> On 22/04/2023 19:54, rsbecker@nexbridge.com wrote:
>>> On Saturday, April 22, 2023 2:02 PM, Jeremy Morton wrote:
>>>> Yes, I know Linus specifically doesn't store file rename info in Git.
>>>> The trouble is, every now and then, I'll come across a situation
>>>> where Git doesn't successfully detect that I've renamed a file
>>>> because I'm doing something like renaming a class at the same time.
>>>> So I'll have a file OldClassNameTests.cs and a NewClassNameTests.cs
>>>> but a bunch of lines in that file have also changed from
>>>> OldClassName.DoThing() to NewClassName.DoThing(). I can clearly see
>>>> that this is a rename, but Git sees enough changed content that it
>>>> doesn't realize it, and puts it in as a delete/add, losing the content history.
>>>>
>>>> The standard answer for this is to rename the file in one commit,
>>>> then make the changes. That's fine if you know ahead of time you'll
>>>> want to do this. However it's a total PITA if you have a bunch of
>>>> changes and you realize that a rename has caused this problem. You
>>>> now have to back out your changes to the renamed file, add the rename, commit
>> it, then re-apply the changes.
>>>>
>>>> Could a command be added to git that means you tell Git that counts
>>>> as a file rename? Git would add a marker to the staging area that
>>>> the file has been renamed, and upon commit, would first generate an
>>>> additional commit for each rename before generating the main commit,
>>>> ensuring the rename operation counts as an actual rename, and the content's
>> history is maintained.
>>>
>>> Would git mv work in your situation? You can stage changes to the original file,
>> then use git mv. Or use git mv first. The rename shows as staged in any event.
>>> --Randall
>>>
>>>
>
>
next prev parent reply other threads:[~2023-04-22 19:54 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 [this message]
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
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=3ac19159-7314-c299-5112-b0f7aa2cc409@game-point.net \
--to=admin@game-point.net \
--cc=git@vger.kernel.org \
--cc=rsbecker@nexbridge.com \
/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).