From: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com>
To: "Junio C Hamano" <gitster@pobox.com>,
"Marco Stephan" <marc.stephan96@hotmail.de>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Git revert cannot be aborted if the repository directory has been copied
Date: Sun, 03 Nov 2024 16:07:46 +0100 [thread overview]
Message-ID: <bb6d781e-fc67-4790-a3a9-8b672dcfe7a0@app.fastmail.com> (raw)
In-Reply-To: <9fd66b8f-c457-451b-9862-6121128b2786@app.fastmail.com>
On Sun, Nov 3, 2024, at 16:04, Kristoffer Haugsbakk wrote:
> On Sun, Nov 3, 2024, at 03:34, Junio C Hamano wrote:
>> Marco Stephan <marc.stephan96@hotmail.de> writes:
>>
>>> If you copy a Git repository directory to another path while there is a revert in progress for the Git repository, "git revert --abort" does not work anymore for the copied repository. Instead, it will report an error of the following format:
>>> error: Entry '...' not uptodate. Cannot merge.
>>> fatal: Could not reset index file to revision '...'.
>>
>> I wonder if
>>
>> $ git update-index --refresh
>>
>> is all it takes.
>
>
> This is correct. This successful test can be added to
> t3501-revert-cherry-pick.sh:
(Meaning one can add it there if one wants to see for themselves)
--
Kristoffer Haugsbakk
next prev parent reply other threads:[~2024-11-03 15:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-03 1:25 Git revert cannot be aborted if the repository directory has been copied Marco Stephan
2024-11-03 2:34 ` Junio C Hamano
2024-11-03 15:04 ` Kristoffer Haugsbakk
2024-11-03 15:07 ` Kristoffer Haugsbakk [this message]
2024-11-03 15:13 ` Kristoffer Haugsbakk
2024-11-03 17:33 ` AW: " Marco Stephan
2024-11-04 9:55 ` Phillip Wood
2024-11-07 19:52 ` AW: " Marco Stephan
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=bb6d781e-fc67-4790-a3a9-8b672dcfe7a0@app.fastmail.com \
--to=kristofferhaugsbakk@fastmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=marc.stephan96@hotmail.de \
/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 NNTP newsgroup(s).