Hello there, 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. I could've sworn that there is not even a file change on the repository (because I sync it between a VM, and after a `git pull` I saw 3 file changes, two of them being the branch head and the log branch head) With regards, Ntentos Stavros ---------- Forwarded message --------- From: Σταύρος Ντέντος <stdedos@xxxxxxxxx> Date: Wed, 16 Dec 2020 at 12:32 Subject: Bug in `git add -N xyz ; git stash` command To: git <git@xxxxxxxxxxxxxxx> Hello there, 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. I could've sworn that there is not even a file change on the repository (because I sync it between a VM, and after a `git pull` I saw 3 file changes, two of them being the branch head and the log branch head) With regards, Ntentos Stavros
