由于 mac 行结尾，git 将整个文件视为一行

Question

我在 Windows 平台上工作，文件采用 Mac ANSI 编码

当我编辑文件的一行，然后执行git diff 时，我看到的是：

diff --git a/class.php b/class.php
@@ -1 +1 @@
-<?php^Mclass Type {^M^M   private $x;// level^M ..etc
\ No newline at end of file
+<?php^Mclass Type {^M^M   private $x;// level^M ..etc
\ No newline at end of file

换句话说，由于 mac 行结尾，git 将我的文件视为单行。我查看了 git hub 上的各种帖子并尝试了一些解决方案，但都没有奏效。对于发生了什么以及如何正确提交我的文件，我有点迷茫。

我尝试过的链接：

• git-diff to ignore ^M
• https://help.github.com/articles/dealing-with-line-endings#platform-windows
• http://lostechies.com/keithdahlby/2011/04/06/windows-git-tip-hide-carriage-return-in-diff/

在行中仍然是相同的 ^M。 git 在 Windows 上似乎不能很好地处理 \r 。我必须将整个回购行结尾转换为 \r\n 吗？有没有办法让mac编码保持原样？

更多信息：

我的 .gitattributes 文件：

# Set default behaviour, in case users don't have core.autocrlf set.
* text=auto

# Explicitly declare text files we want to always be normalized and converted
# to native line endings on checkout.
*.php text
*.inc text
*.js text
*.txt text

# Declare files that will always have CRLF line endings on checkout.
*.sln text eol=crlf

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
*.gif binary

我运行了这个命令：git config --global core.autocrlf true

Answer 1

TL;DR 版本

#rewrite ALL your branches, ALL trees, ALL commits to use proper line endings
git filter-branch --tree-filter '~/fix-eol.sh' -d /dev/shm/repo-temp --tag-name-filter cat  --prune-empty -- --all

#git may complain after this procedure and have unclean directory.  Just do:
git reset --hard

#go over your repo and delete your tags and old tree references, 
#old branch pointers on both remote and local
git tag -d v1.1.0
git push . :refs/original/refs/tags/v1.1.0
etc...

#re-compress your objects..
git gc --aggressive

#some more clean up
git prune

#CAUTION:  this will rewrite your origin repo, 
#you (and everybody else) using it will have to run git clone 
#to re-download the entire repo.  This was a destructive operation afterall
#(normalizing all line endings in your entire repo)
git push --force

猫~/fix-eol.sh

#!/bin/bash
# ~/fix-eol.sh
# convert all js,css,html, and txt files from DOS to UNIX line endings
find . -type f -regex ".*\.\(js\|css\|inc\|html\|txt\|php\)" | xargs perl -pi -e 's/\r\n|\n|\r/\n/g'

长版：

我说了算，现在尝试这里描述的第二种解决方案：

http://blog.gyoshev.net/2013/08/normalizing-line-endings-in-git-repositories/

使用dos2unix命令规范化我所有包含文件的文本和代码以包含\n unix风格的行尾（dos2unix不适用于mac，哈哈，当然！它不是mac2unix）

所以我在这里使用了转换器：Converting newline formatting from Mac to Windows

它重写了整个存储库，现在以正确的行结尾，我认为在push --force 和人们重新下载存储库之后，一切都会好起来的。