Git状态显示修改，Git checkout—<文件>不会删除它们

我想删除对我的工作副本的所有更改。运行git状态显示已修改的文件。我所做的一切似乎都无法消除这些修改。例如:

rbellamy@PROMETHEUS /d/Development/rhino-etl (master)
$ 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:   Rhino.Etl.Core/Enumerables/CachingEnumerable.cs
#       modified:   Rhino.Etl.Core/Pipelines/SingleThreadedPipelineExecuter.cs
#       modified:   Rhino.Etl.Tests/Rhino.Etl.Tests.csproj
#       modified:   Rhino.Etl.Tests/SingleThreadedPipelineExecuterTest.cs
#
no changes added to commit (use "git add" and/or "git commit -a")

rbellamy@PROMETHEUS /d/Development/rhino-etl (master)
$ git checkout -- Rhino.Etl.Core/Enumerables/CachingEnumerable.cs

rbellamy@PROMETHEUS /d/Development/rhino-etl (master)
$ 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:   Rhino.Etl.Core/Enumerables/CachingEnumerable.cs
#       modified:   Rhino.Etl.Core/Pipelines/SingleThreadedPipelineExecuter.cs
#       modified:   Rhino.Etl.Tests/Rhino.Etl.Tests.csproj
#       modified:   Rhino.Etl.Tests/SingleThreadedPipelineExecuterTest.cs
#
no changes added to commit (use "git add" and/or "git commit -a")

rbellamy@PROMETHEUS /d/Development/rhino-etl (master)
$ git checkout `git ls-files -m`

rbellamy@PROMETHEUS /d/Development/rhino-etl (master)
$ 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:   Rhino.Etl.Core/Enumerables/CachingEnumerable.cs
#       modified:   Rhino.Etl.Core/Pipelines/SingleThreadedPipelineExecuter.cs
#       modified:   Rhino.Etl.Tests/Rhino.Etl.Tests.csproj
#       modified:   Rhino.Etl.Tests/SingleThreadedPipelineExecuterTest.cs
#
no changes added to commit (use "git add" and/or "git commit -a")

rbellamy@PROMETHEUS /d/Development/rhino-etl (master)
$ git reset --hard HEAD
HEAD is now at 6c857e7 boo libraries updated to 2.0.9.2 and rhino.dsl.dll updated.

rbellamy@PROMETHEUS /d/Development/rhino-etl (master)
$ 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:   Rhino.Etl.Core/Enumerables/CachingEnumerable.cs
#       modified:   Rhino.Etl.Core/Pipelines/SingleThreadedPipelineExecuter.cs
#       modified:   Rhino.Etl.Tests/Rhino.Etl.Tests.csproj
#       modified:   Rhino.Etl.Tests/SingleThreadedPipelineExecuterTest.cs
#
no changes added to commit (use "git add" and/or "git commit -a")

当前回答

有一致的行尾是件好事。例如，它不会触发不必要的合并，尽管这是微不足道的。我曾经见过Visual Studio用混合行结尾创建文件。

还有一些程序，如bash(在linux上)确实要求.sh文件以LF终止。

为了确保发生这种情况，可以使用gitattributes。不管autcrlf的值是什么，它都在存储库级别上工作。

例如，你可以有这样的.gitattributes: *文本=汽车

如果对您的情况有影响，您还可以更具体地指定每个文件类型/扩展名。

然后，selff可以在本地转换Windows程序的行结束符。

在c# / c++ /Java/Ruby/R, Windows/Linux的混合项目中，这种方法运行良好。目前还没有问题。

2012-06-13 03:10:41

其他回答

我只能通过临时删除我的repo的.gitattributes文件来修复这个问题(其中定义了* text=auto和*.c text)。

删除后我运行git状态，修改消失了。即使在.gitattributes被放回原处之后，它们也没有返回。

2013-09-13 10:08:19

如果克隆存储库并立即看到挂起的更改，则存储库处于不一致状态。请不要从.gitattributes文件中注释掉* text=auto。这是专门放在那里的，因为存储库的所有者希望所有文件都以LF行结束符一致存储。

正如HankCa所述，按照https://help.github.com/articles/dealing-with-line-endings/上的说明来解决问题。简单的按钮:

git clone git@host:repo-name
git checkout -b normalize-line-endings
git add .
git commit -m "Normalize line endings"
git push
git push -u origin normalize-line-endings

然后将分支合并(或拉取请求)到回购的所有者。

2016-12-05 20:44:02

我有一个老的冗余分支，有不同的行尾。切换到这个让我有点卡住了，直到我用了一些力。

git checkout mainbranch --force

接着是一个快速的git分支-D brokenbranch。

2021-03-31 14:27:10

我提交了所有的更改，然后在提交时执行并撤消。这对我很有效

转到添加。

git commit -m "随机提交"

git重置-硬头~1

2018-02-07 10:49:29

这里有很多解决方案，也许我应该在提出自己的解决方案之前尝试其中一些。总之，这里还有一个…

我们的问题是，我们没有对结束行进行强制执行，并且存储库混合使用DOS / Unix。更糟糕的是，在这个位置上，它实际上是一个开源的回购，而我们已经分叉了。那些拥有操作系统存储库主要所有权的人决定将所有的结束行更改为Unix，并且提交包含一个.gitattributes来强制行结束。

不幸的是，这似乎会导致像这里描述的那样的问题，一旦合并DOS-2-Unix之前的代码，文件将永远被标记为已更改，无法恢复。

在我的研究过程中，我遇到了- https://help.github.com/articles/dealing-with-line-endings/ -如果我再次面临这个问题，我会首先尝试一下。

以下是我所做的:

I'd initially done a merge before realising I had this problem and had to abort that - git reset --hard HEAD (I ran into a merge conflict. How can I abort the merge?) I opened the files in question in VIM and changed to Unix (:set ff=unix). A tool like dos2unix could be used instead of course committed merged the master in (the master has the DOS-2-Unix changes) git checkout old-code-branch; git merge master Resolved conflicts and the files were DOS again so had to :set ff=unix when in VIM. (Note I have installed https://github.com/itchyny/lightline.vim which allowed me to see what the file format is on the VIM statusline) committed. All sorted!

2015-12-09 00:23:21

Git状态显示修改，Git checkout—<文件>不会删除它们

推荐文章

最新文章

标签