git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Jeff King <peff@peff.net>
Date
Apr 9, 2020, 23:57 UTC
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:
Show 5 quoted lines
> 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
Previous: Erwin BonsmaNext: Erwin Bonsma
Message 2 of 3 in “Commit includes rename which was not staged, nor actually performed”
  1. Erwin BonsmaApr 8, 2020
  2. Jeff KingApr 9, 2020
  3. Erwin BonsmaApr 10, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.