Re: Commit includes rename which was not staged, nor actually performed

From: Erwin Bonsma <erwin.bonsma@gmail.com>
Date: Apr 10, 2020, 06:47 UTC
Message-ID: <CAG5PFTs5CbB0+JY5qgqL91fSziNwNNEPfL8tKv30NAZGtNtWeA@mail.gmail.com>
In-Reply-To: <20200409235719.GA46281@coredump.intra.peff.net>

Hi Peff,

Thanks for the analysis. I am happy to hear that it is fixed already.

Btw, version 2.24.1 with the bug is part of the latest XCode release (11.4). Hopefully a new version of XCode will be released fairly soon, and will include an updated git version. Otherwise, other macOS developers may experience (and report) similar issues. I will at least report this issue with XCode.

Cheers, Erwin

On Fri, Apr 10, 2020 at 1:57 AM Jeff King <peff@peff.net> wrote:

Show 17 quoted lines

>
> 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