Git: 如何恢复2个顽固地停留在“已更改但未提交”的文件？

我有一个回购，有两个文件，据说我改变了本地。

所以我只能说:

$ git status
# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   dir1/foo.aspx
#       modified:   dir2/foo.aspx
#
no changes added to commit (use "git add" and/or "git commit -a")

执行 git diff表明整个文件内容已经改变，即使从目测来看似乎不正确(似乎有一些常见的行范围，diff 似乎没有看到)。

有趣的是，我不记得在本地修改过这些文件，这个回购协议与一个远程回购协议一起使用(私有的，在 GitHub.com，FWIW)。

无论我怎样尝试，我都不能丢弃这些局部变化。我尝试了以下所有方法:

$ git checkout -- .
$ git checkout -f
$ git checkout -- dir1/checkout_receipt.aspx
$ git reset --hard HEAD
$ git stash save --keep-index && git stash drop
$ git checkout-index -a -f

换句话说，我已经尝试了 如何在 Git 中丢弃未暂存的更改？中描述的所有东西，还有更多。但这两个文件仍然卡在“已更改但未提交”的地方。

究竟是什么原因导致两个文件像这样卡住并且看起来像“不可逆转的表”？

附言。在上面显示我已经尝试过的命令的列表中，我错误地将 git revert写成了 git checkout。我很抱歉并且感谢那些回答我应该尝试 checkout的人。我编辑了这个问题来纠正它。我肯定已经试过 checkout了。

48052 次浏览
小开 
git checkout dir1/foo.aspx
git checkout dir2/foo.aspx
小开

Try to revert local changes:

git checkout -- dir1/foo.aspx
git checkout -- dir2/foo.aspx
小开
最佳答案

What are the line endings in the files? I'm betting they're CRLF. If they are, check out this guide: http://help.github.com/line-endings/

In short, you need to make sure git is set to convert the line endings to LF on commit, and then commit those files. Files in the repo should always be LF, files checked out should be the OS's native, assuming you set git correctly.

小开

Another possibility is that the difference (that's preventing your from reverting these files with a checkout command) is one of file mode. This is what happened to me. On my version of git you can discover this by using

git diff dir1/foo.aspx

And it will show you file mode changes. It still won't let you revert them, though. For that use either

git config core.filemode false

or change your git .config in your text editor by adding

[core]

filemode = false

After you do this, you can use

git reset HEAD dir1/foo.aspx

and the file should disappear.

(I got all of this from the answer to How do I make git ignore mode changes (chmod)?)

小开

I spent hours trying to solve a similar issue - a remote branch that I had checked out, which stubbornly showed four files as 'Changed but not updated', even when deleting all files and running git checkout -f again (or other variations from this post)!

These four files were necessary, but certainly hadn't been modified by me. My final solution - persuade Git that they had not been changed. The following works for all checked out files, showing 'modified' status - make sure you have already committed/stashed any that have really been modified!:

git ls-files -m | xargs -i git update-index --assume-unchanged "{}"

On Mac OSX, however xargs operates a little bit different (thx Daniel for the comment):

git ls-files -m | xargs -I {} git update-index --assume-unchanged {}

I've added this as a placeholder for myself for next time, but I hope it helps someone else too.

-Al

小开

I had some phantom changed files that were showing as modified, but were actually identical.

Running this command sometimes works:
(Turns off git's "smart" but often unhelpful line-ending conversions)

git config --local core.autocrlf false

But in another case I found it was due to a .gitattributes file in the root which had some line-ending settings present, which was trying to apply autocrlf for certain files even when it was turned off. That wasn't actually helpful, so I deleted .gitattributes, committed, and the file no longer showed as modified.

小开

this is how I fixed the same problem in my case: open .gitattributes change:

* text=auto

to:

#* text=auto

read more here https://code.visualstudio.com/docs/remote/troubleshooting#_resolving-git-line-ending-issues-in-containers-resulting-in-many-modified-files

save and close , then revert or reset, thanks to @Simon East for the hint

小开

I think it would be helpful to provide a hint on how to reproduce the issue, in order to better understand the problem:

$ git init
$ echo "*.txt -text" > .gitattributes
$ echo -e "hello\r\nworld" > 1.txt
$ git add 1.txt
$ git commit -m "committed as binary"
$ echo "*.txt text" > .gitattributes
$ echo "change.." >> 1.txt


# Ok let's revert now


$ git checkout -- 1.txt
$ git status
modified:   1.txt


# Oooops, it didn't revert!!




# hm let's diff:


$ git diff
warning: CRLF will be replaced by LF in 1.txt.
The file will have its original line endings in your working
directory.
diff --git a/1.txt b/1.txt
index c78c505..94954ab 100644
--- a/1.txt
+++ b/1.txt
@@ -1,2 +1,2 @@
-hello
+hello
world


# No actual changes. Ahh, let's change the line endings...


$ file 1.txt
1.txt: ASCII text, with CRLF line terminators
$ dos2unix 1.txt
dos2unix: converting file 1.txt to Unix format ...
$ git diff
git diff 1.txt
diff --git a/1.txt b/1.txt
index c78c505..94954ab 100644
--- a/1.txt
+++ b/1.txt
@@ -1,2 +1,2 @@
-hello
+hello
world


# No, it didn't work, file is still considered modified.


# Let's try to revert for once more:
$ git checkout -- 1.txt
$ git status
modified:   1.txt


# Nothing. Let's use a magic command that prints wrongly committed files.


$ git grep -I --files-with-matches --perl-regexp '\r' HEAD


HEAD:1.txt

2nd way to reproduce: In the above script replace this line:
echo "*.txt -text" > .gitattributes
with
git config core.autocrlf=false
and keep the rest of the lines as is

What all the above say? A text file can (under some circumstances) be committed with CRLF, (e.g. -text in .gitattributes / or core.autocrlf=false).

When we later want to treat the same file as text (-text -> text) it will need to be committed again.
Of course you can temporarily revert it (as correctly answered by Abu Assar). In our case: 

echo "*.txt -text" > .gitattributes
git checkout -- 1.txt
echo "*.txt text" > .gitattributes

The answer is: do you really want to do that, because it's gonna cause the same problem everytime you change the file.

For the record:

To check which files can cause this problem in your repo execute the following command (git should be compiled with --with-libpcre): 

git grep -I --files-with-matches --perl-regexp '\r' HEAD

By committing the file(s) (supposing that you want to treat them as text), it is the same thing as doing what is proposed in this link http://help.github.com/line-endings/ for fixing such problems. But, instead of you removing .git/index and performing reset, you can just change the file(s), then perform git checkout -- xyz zyf and then commit.

小开

For me the issue was not about line endings. It was about changing case in folder name (Reset_password -> Reset_Password). This solution helped me: https://stackoverflow.com/a/34919019/1328513

小开

You also might have had a problem related to directories naming letter cases. Some of your colleagues could have changed the name of the directory from e.g. myHandler to MyHandler. If you later on pushed and pulled some of the files of the original directory you would have had 2 separate directories on the remote repository AND only one on your local machine since on Windows you only can have just one. And you're in trouble.

To check if that is the case, just see if the remote repository has double structure.

To fix this, make a backup copy of the parent directory outside of the repo, then delete the parent directory, push it. Make a pull (here's when the second one marked as deleted should appear on status) and push again. After that, recreate the whole structure from your backup and push the changes again.

小开

I had the same issue, with the interesting addition that the files were changed on windows, but not when looking at them from WSL. No amount of messing around with line endings, resets etc. was able to change it.

Eventually, I found a solution in this answer. Following is the text for convenince:

I have resolved this problem using following steps

1) Remove every file from Git's index.

git rm --cached -r .

2) Rewrite the Git index to pick up all the new line endings.

git reset --hard

Solution was part of steps described on git site https://help.github.com/articles/dealing-with-line-endings/

小开

This issue can also be cause because git treats capitalization differences as different files but windows treats them as the same file. If a file name only had it's capitalization changed then every windows user of that repo will end up in this situation.

The solution is to confirm the files contents are correct and then recommit it. We had to merge the two files contents together since they were different. Then pull and there will be a merge conflict which you can resolve by deleting the duplicate file. Recommit the merge resolution and you are back to a stable state.

小开

My issue was something else. No amount of reset, clean, restore, or other git commands resolved my issue. I also tried deleting the file, reverting, etc., and every time I pulled, it would come right back.

> git status
On branch master
Your branch is behind 'origin/master' by 319 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)


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:   bucket/stellarium.json

I fixed it by the following:

Rename / move the file out of the way. (--> Not git mv)

> mv .\bucket\stellarium.json .\bucket\stellarium_DELETEME.json
> git status
On branch master
Your branch is up to date with 'origin/master'.


Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
deleted:    bucket/stellarium.json


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

Restore the file.

> git restore .\bucket\stellarium.json
> git status
On branch master
Your branch is up to date with 'origin/master'.


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

Delete the renamed file.

> rm .\bucket\stellarium_DELETEME.json
> git status
On branch master
Your branch is up to date with 'origin/master'.


nothing to commit, working tree clean

So... ?

Perhaps the disk's FAT got screwed up? I'm not sure. Still don't know. But, it worked.

小开

Been there, time has always been one of my greatest enemy so decided to go with the easiest solution.

  1. move the 2 local version files elsewhere
  2. Commit and push
  3. copy the files manually to the git server
  4. pull
小开

Short answer: check .gitattibutes for any setting that might affect the files that have problems.

For me there was a setting in .gitattributes forcing eol=crlf for some specific files:

*.bat text eol=crlf That was added to force those files have crlf in Windows.

I had to comment that line:

#*.bat text eol=crlf

I use macOS, the problem showed up whenever I was switching branches. Before commenting this setting I had to do a git rm --cached -r . and a hard reset every time.


提交答案