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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux