From: Jeff King <peff@peff.net>
Date: Thu, 09 Apr 2020 23:57:19 GMT
Subject: Re: Commit includes rename which was not staged, nor actually performed
Message-ID: <20200409235719.GA46281@coredump.intra.peff.net>
In-Reply-To: <CAG5PFTvqnR-aeJ=+4W5A5WKqJ8Wq3JsD7J5QjwprE+Nws+=YBg@mail.gmail.com>

On Wed, Apr 08, 2020 at 09:28:09PM +0200, Erwin Bonsma wrote:

> The branch includes the wrong commit. To reproduce it:
> > git reset --soft HEAD~1
> > git restore --staged de.xliff
> > git restore --staged Pending/it.xliff.todo
> > git restore de.xliff

There was a bug where git-restore didn't correctly invalidate the
cache-tree extension of the index, and could cause phantom changes to
end up in commits.

It was fixed by e701bab3e9 (restore: invalidate cache-tree when removing
entries with --staged, 2020-01-08), which is in v2.25.1 and up.

-Peff