Visual Studio 2019 with Git - "Undo Changes" doesn't always work

Question

Sometimes in Visual Studio 2019, when working with a Git repo, right-clicking and selecting Undo Changes in Team Explorer doesn't work as expected. While the changes are indeed undone, the file icon still remains under the Changes heading.

Even if it does disappear, oftentimes if I then run git status from the console, the filename will show in the console under changes not staged for commit.

I can fix this easily enough by running git reset --hard. Even so, it's an annoyance. Any idea what's going on under the hood of VS that causes it to (mal)function this way?

score 23 · Answer 1 · answered Jan 05 '21 at 11:44

Based on your description (undo does not update file status, git reset --hard is a workaround), this sounds like the following issue:

https://developercommunity2.visualstudio.com/t/Undo-changes-with-new-git-experience-pre/1170228

The root cause seems to be related to line endings:

Microsoft:

So our suspicion is that maybe dotnet format rewrote the line endings (and only the line-endings), so now git status reports that there are changed files. However, if you try to actually checkout-index, git will not actually mutate anything. However, git status believes there are changes, because the stat-block is leading it to believe there has been a change (since there has been a change). One way to verify this is to, from the command line, or visual studio. Stage everything (git add *) (you can do this from visual studio by right click > stage) git status (or, if in Visual Studio, it will refresh status automatically) If the files disappear from view, then there's a line-ending issue, and git has suddenly realized that they're actually the same file.

Reporter:

Yes! Staging everything made all of the files disappear :-)

Microsoft:

Cool! So here’s what we know! For EOL-only changes, SHA changes don’t change. Git apparently stores these internally as LF-only Neither checkout nor checkout-index will overwrite the file on disk Basically, since git is our source of truth here, we get misleading information. However, I think git maybe made the right decision here in regards to performance. That being said, this is super confusing from a UX perspective, so we’ll be evaluating this. We’re evaluating how to improve this UX.

The issue is still open but it seems that the root caused was identified. For now, there's only the workaround.

+1: I can confirm this answer is correct; just stage any file with an "invisible phantom change", and that file just "magically" disappears from the list of changed files (without getting included in the list of staged files list either). — Will, Jun 02 '21 at 23:07
@Will Can confirm, just got same problem in latest version of VS 2019. Staging somehow make the file disappear. Confusing. — Tomas Voracek, Aug 16 '21 at 08:30
It still doesn't work in VS2022. Why am I not remotely surprised. — Neutrino, May 06 '22 at 14:47
Staging trick still works even in latest versions of VS2022 and Git. — Tomas Voracek, Jul 29 '22 at 15:07

score 3 · Answer 2 · answered Jul 22 '21 at 17:42

3

I had one file that got stuck in this status. The issue was the casing of the local file didnt match the casing of the remote file, although the spelling was the same.

answered Jul 22 '21 at 17:42

mswaim

31
1

score 0 · Answer 3 · answered Aug 11 '22 at 15:41

0

In my case, the operation was being blocked because I had a Build/Debug running.

answered Aug 11 '22 at 15:41

cr4z

501
6
9

score 0 · Answer 4 · edited Apr 05 '23 at 14:27

0

Here is what I did to have vstudio behave correctly when doing "Undo changes" or when saving the file to disk. If you run the following command in a cmd shell:

git config --global core.autocrlf false

Vstudio will respect this git configuration setting.

edited Apr 05 '23 at 14:27

SwissCodeMen

4,222
8
24
34

answered Mar 29 '23 at 18:43

DComfort

1

Visual Studio 2019 with Git - "Undo Changes" doesn't always work

4 Answers4