5

git我和我的同事在处理我们的 Windows 存储库克隆中的某些文件时遇到了可怕的麻烦。克隆是通过克隆源自 OSX 机器的存储库来完成的。我们已将 autocrlf 设置为 true，但问题是我们经常发现git认为已更改的文件，即使我们从未接触过它们（我们甚至不会在编辑器中打开它们。

以下输出说明了这个问题：我哪里出错了？

$ git status                                                                                                 
# On branch master                                                                                           
# Your branch is behind 'origin/master' by 27 commits, and can be fast-forwarded.                            
#                                                                                                            
# 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:   Web Applications/webclient/language/en/lang_copyitems.ini                                
#                                                                                                            
no changes added to commit (use "git add" and/or "git commit -a")                                            

Administrator@windows-dev ~/Documents/Workspace/prestige.git                                                 
$ git diff "Web Applications/webclient/language/en/lang_copyitems.ini"                                       
diff --git a/Web Applications/webclient/language/en/lang_copyitems.ini b/Web Applications/webclient/language/
index 800c188..ed11c0e 100644                                                                                
--- a/Web Applications/webclient/language/en/lang_copyitems.ini                                              
+++ b/Web Applications/webclient/language/en/lang_copyitems.ini                                              
@@ -1,12 +1,12 @@                                                                                            
-<EF><BB><BF>   [Header]                                                                                     
-       Description=Language strings for 'copyitems.php'                                                     
-                                                                                                            
-       [Messages]                                                                                           
-       300=Copy                                                                                             
-       301=Close                                                                                            
-       302=COPY STORIES                                                                                     
-       303=Name                                                                                             
-       304=In Queue                                                                                         
-       305=New Name                                                                                         
-       306=Items to Copy                                                                                    
-       308=This item has mandatory metadata fields that are not correctly set. Click any part of this messag
+<EF><BB><BF>   [Header]                                                                                     
+       Description=Language strings for 'copyitems.php'                                                     
+                                                                                                            
+       [Messages]                                                                                           
+       300=Copy                                                                                             
+       301=Close                                                                                            
+       302=COPY STORIES                                                                                     
+       303=Name                                                                                             
+       304=In Queue                                                                                         
+       305=New Name                                                                                         
+       306=Items to Copy                                                                                    
+       308=This item has mandatory metadata fields that are not correctly set. Click any part of this messag

Administrator@windows-dev ~/Documents/Workspace/prestige.git                                                 
$ git checkout HEAD "Web Applications/webclient/language/en/lang_copyitems.ini"                              

Administrator@windows-dev ~/Documents/Workspace/prestige.git                                                 
$ git status                                                                                                 
# On branch master                                                                                           
# Your branch is behind 'origin/master' by 27 commits, and can be fast-forwarded.                            
#                                                                                                            
# 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:   Web Applications/webclient/language/en/lang_copyitems.ini                                
#
4

2 回答 2

7

如GitHub 指南所示，此设置的问题是在检出存储库期间完成自动转换......

这意味着您无需打开文件即可触发任何更改。

是否不能保持autocrlf为假，并在能够尊重返回行字符的编辑器中打开那些 Windows 文件？

注意（此处说明），如果您需要转换，除了某些文件，您可以在父目录中添加一个 .gitattributes ，并带有：

myFile -crlf

在文件中，您将属性设置为路径（或模式），或取消设置它们（使用减号）。属性是告诉文件是否受选项影响
的属性。如果取消设置，Git 不会弄乱文件中的行尾crlfcore.autocrlf

于 2009-07-30T12:57:09.493 回答
2

为了在我的 Windows 7 机器上使用 git 1.7.3.1 解决这个问题，我必须将 core.filemode 选项设置为 false。

git config -e --local
于 2011-09-20T14:04:40.657 回答