Σταύρος Ντέντος <stdedos@xxxxxxxxx> 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@xxxxxxxxxxxxxx/ I wonder.