Re: Git revert cannot be aborted if the repository directory has been copied

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 3, 2024, 02:34 UTC
Message-ID: <xmqqo72xxcxo.fsf@gitster.g>
In-Reply-To: <AM0PR02MB4980D186BDC087336C760132E6502@AM0PR02MB4980.eurprd02.prod.outlook.com>

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. The symptom, i.e. Git declares that an otherwise unmodifed path is not uptodate, is not limited to "revert" or aborting it, but is a common thing a newbie sees after copyihg a working tree to elsewhere, and "refresh the index" is an often given recovery procedure for such a situation.

I'll not comment if this is a bug or not, and let others argue.