Git reset HEAD~1 does not leave modified files in working tree

[EdwinTam-MSFT]

• Git reset HEAD~1 in newer git versions does not leave modified files in working tree, files doesn't show up until additional local modifications are made

Setup

• Which version of Git for Windows are you using? Is it 32-bit or 64-bit?

git version 2.35.1.vfs.0.0

Edit: This user is also using VFS for Git.

• Which version of Windows are you running? Vista, 7, 8, 10? Is it 32-bit or 64-bit?

Windows 10 and 11 64bit

• What options did you set as part of the installation? Or did you choose the
  defaults?

default

Details

• Which terminal/shell are you running Git from? e.g Bash/CMD/PowerShell/other

both CMD and Bash

2.33.0

2.35.1

D:\os.2020.3\src>git status warning: unable to find all commit-graph files On branch official/main Your branch is up to date with 'origin/official/main'. nothing to commit, working tree clean D:\os.2020.3\src>git reset HEAD~1 warning: unable to find all commit-graph files D:\os.2020.3\src>git status Refresh index: 100% (3130996/3130996), done. warning: unable to find all commit-graph files On branch official/main Your branch and 'origin/official/main' refer to different commits. (use "git status --ahead-behind" for details) Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: sdpublic/misc/Labels/main_label.xml no changes added to commit (use "git add" and/or "git commit -a")

D:\os.2020.4\src>git reset HEAD~1 warning: unable to find all commit-graph files D:\os.2020.4\src>git status warning: unable to find all commit-graph files On branch official/main Your branch and 'origin/official/main' refer to different commits. (use "git status --ahead-behind" for details) nothing to commit, working tree clean

[dscho]

@EdwinTam-MSFT thank you for your report!

I do have a hard time trying to reproduce it, though, especially because you did not provide any minimal reproducer. Could you please do that?

Here is my failed attempt at verifying that the issue actually exists (I used the PortableGit from https://github.com/microsoft/git/releases/tag/v2.35.1.vfs.0.0, running its git-bash.exe):

me@work MINGW64 ~/repros
$ git init msgit-490-reset-head-tilde-1
Initialized empty Git repository in C:/Users/me/repros/msgit-490-reset-head-tilde-1/.git/

me@work MINGW64 ~/repros
$ cd msgit-490-reset-head-tilde-1

me@work MINGW64 ~/repros/msgit-490-reset-head-tilde-1 (main)
$ >a1

me@work MINGW64 ~/repros/msgit-490-reset-head-tilde-1 (main)
$ git add a1

me@work MINGW64 ~/repros/msgit-490-reset-head-tilde-1 (main)
$ git commit -m a1
[main (root-commit) 73cccad] a1
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 a1

me@work MINGW64 ~/repros/msgit-490-reset-head-tilde-1 (main)
$ >a2

me@work MINGW64 ~/repros/msgit-490-reset-head-tilde-1 (main)
$ git add a2

me@work MINGW64 ~/repros/msgit-490-reset-head-tilde-1 (main)
$ git commit -m a2
[main af3a152] a2
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 a2

me@work MINGW64 ~/repros/msgit-490-reset-head-tilde-1 (main)
$ git reset HEAD~1

me@work MINGW64 ~/repros/msgit-490-reset-head-tilde-1 (main)
$ git status
On branch main
Untracked files:
  (use "git add <file>..." to include in what will be committed)
        a2

nothing added to commit but untracked files present (use "git add" to track)

me@work MINGW64 ~/repros/msgit-490-reset-head-tilde-1 (main)
$ echo hello >a1

me@work MINGW64 ~/repros/msgit-490-reset-head-tilde-1 (main)
$ git commit -m a1-modified -a
warning: LF will be replaced by CRLF in a1.
The file will have its original line endings in your working directory
[main bef76c0] a1-modified
 1 file changed, 1 insertion(+)

me@work MINGW64 ~/repros/msgit-490-reset-head-tilde-1 (main)
$ git reset HEAD~1
Unstaged changes after reset:
M       a1

me@work MINGW64 ~/repros/msgit-490-reset-head-tilde-1 (main)
$ git status
On branch main
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   a1

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        a2

no changes added to commit (use "git add" and/or "git commit -a")

As you can see, the file is totally shown as modified, without any additional modifications required.

[derrickstolee]

@dscho: one thing that appears to be missing from the issue report is that this user is using VFS for Git. I'll make a note to update the issue template to ask "Scalar or VFS for Git?"

[EdwinTam-MSFT]

@dscho: I opened this issue on behalf of the original internal bug reporter. As Derrick had mentioned, our internal repo uses GVFS
Locally when I tried to repo the issue, I had the version of git and gvfs version installed from this link https://github.com/microsoft/VFSForGit/releases

I upgraded git to 2.35 using latest release here
https://github.com/microsoft/git/releases

afterwards I uninstall git and downgraded back to 2.33 to confirm

Each time, I had created a fresh repo using gvfs clone
and the rest of the commands were essentially listed above
git reset HEAD~1 // to rollback a commit
git status // to confirm open files