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

From: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Date: Nov 3, 2024, 15:13 UTC
Message-ID: <89796e97-e5e1-4668-8b81-692579547bbf@app.fastmail.com>
In-Reply-To: <AM0PR02MB4980D186BDC087336C760132E6502@AM0PR02MB4980.eurprd02.prod.outlook.com>

On Sun, Nov 3, 2024, at 02:25, Marco Stephan wrote:

Show 5 quoted lines

> This consistently produces the error "error: Entry 'test.txt' not
> uptodate. Cannot merge.". I would expect step 14 to work regardless of
> how the repository directory itself has been created. Running "git
> status" or "git update --really-refresh" fixes the seemingly corrupt
> data and the revert in progress can be aborted.

Okay, I missed that `git update-index --really-refresh` previously.

I’m not a technical expert but is there a use-case here? Or did you find this by accident while doing something else?

-- 
Kristoffer Haugsbakk