git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Erwin Bonsma <erwin.bonsma@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: Commit includes rename which was not staged, nor actually performed
Date: Fri, 10 Apr 2020 08:47:02 +0200	[thread overview]
Message-ID: <CAG5PFTs5CbB0+JY5qgqL91fSziNwNNEPfL8tKv30NAZGtNtWeA@mail.gmail.com> (raw)
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:
>
> 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

      reply	other threads:[~2020-04-10  6:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-08 19:28 Commit includes rename which was not staged, nor actually performed Erwin Bonsma
2020-04-09 23:57 ` Jeff King
2020-04-10  6:47   ` Erwin Bonsma [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAG5PFTs5CbB0+JY5qgqL91fSziNwNNEPfL8tKv30NAZGtNtWeA@mail.gmail.com \
    --to=erwin.bonsma@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).