From: Jeremy Morton <admin@game-point.net>
To: Erik Cervin Edin <erik@cervined.in>
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 15:42:04 +0100 [thread overview]
Message-ID: <b157077e-a336-e550-2666-9880130eb5aa@game-point.net> (raw)
In-Reply-To: <CA+JQ7M_Lv1acopOpPoHxp7mPwWMFj-7wwwDPpV7KUbwFsjpoxA@mail.gmail.com>
Yep, and that suggestion is rather arduous compared to something like:
git markasrenamed file2 file1
git commit
--
Best regards,
Jeremy Morton (Jez)
On 24/04/2023 15:00, Erik Cervin Edin wrote:
> On Mon, Apr 24, 2023 at 1:17 PM Jeremy Morton <admin@game-point.net> wrote:
>>
>> There's no getting away from the fact that this adds a lot of (IMHO
>> unnecessary) work if you've already done a rename that git can't
>> detect and have both that and a bunch of other changes sitting in the
>> index. What feels like it would be a natural resolution in these
>> cases, though, is a "no, this remove/add is actually a rename" command.
>
> It can definitely be both arduous and non-obvious how to deal with this.
>
> The problem is that such a command cannot exist atm. because renames
> don't exist, they are only interpreted. So the only way to achieve
> this is to revert enough of the contents staged to the index such that
> the rename is detected. The only way to do that in a foolproof manner
> is reverting all the staged changes except the path so that the moved
> file in the index is identical to the old file in HEAD.
>
> If I understand you correctly, your point here is that it's
> non-trivial to go from a state where a file has been renamed, with
> enough changes staged into the index that the rename hasn't been
> detected, to a state where the rename is recorded in the index?
>
> The most straightforward method I can think of to restore the staged
> changes, do the rename without changes, commit and then go about the
> rest
> eg:
> git restore --staged file2
> mv file2 file1
> git mv file1 file2
> git commit -m rename
>
next prev parent reply other threads:[~2023-04-24 14:42 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
2023-04-24 11:17 ` Jeremy Morton
2023-04-24 14:00 ` Erik Cervin Edin
2023-04-24 14:42 ` Jeremy Morton [this message]
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=b157077e-a336-e550-2666-9880130eb5aa@game-point.net \
--to=admin@game-point.net \
--cc=chris.torek@gmail.com \
--cc=erik@cervined.in \
--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).