From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Dec 2020 19:17:18 GMT
Subject: Re: Fwd: Bug in `git add -N xyz ; git stash` command
Message-ID: <xmqq1rfp4l35.fsf@gitster.c.googlers.com>
In-Reply-To: <CAHMHMxW_zwq_xK3Mh5QjC4dM1muVotESZdGQkRAx8xeKYmHzbw@mail.gmail.com>

Σταύρος Ντέντος  <stdedos@gmail.com> writes:

> I think I have found a bug with the following series of commands:
>
> $ git add -N xyz ; git stash
> error: Entry 'xyz' not uptodate. Cannot merge.
> Cannot save the current worktree state
>
> It has bothered me that `git add -N xyz` "is not obvious that it is
> done", unless you know that you did it - and now it seems that there
> is some buggy behavior about that.

Hmph, is this the same issue as what we discussed in

https://lore.kernel.org/git/CA+dzEBmh4LdN-XFS9y9YKrDMzV_7+QpDzBA2uv9Xi80PgR5NTQ@mail.gmail.com/

I wonder.