您需要将--keep-cr
标志传递给git am
。这很不幸,但由于竞争标准(电子邮件工作流程与本地),实际上没有太多选择。
您可能还想尝试设置.gitattributes
文件。试图重新创建你的问题,当我将文件指定为需要CRLF时,我能够使事情发挥作用。请注意,没有首先对文件进行标准化,它确实将整个文件显示为已修改。我通常使用.gitattributes
本:
.gitattributes export-ignore
.gitignore export-ignore
*.txt text
*.C text trailing-space space-before-tab -indent-with-non-tab
*.rst text trailing-space space-before-tab -indent-with-non-tab
*.clj text trailing-space space-before-tab -indent-with-non-tab
*.c text diff=cpp trailing-space space-before-tab -indent-with-non-tab
*.cpp text diff=cpp trailing-space space-before-tab -indent-with-non-tab
*.h text diff=cpp trailing-space space-before-tab -indent-with-non-tab
*.hpp text diff=cpp trailing-space space-before-tab -indent-with-non-tab
*.py text diff=python trailing-space space-before-tab -indent-with-non-tab
*.tex text diff=tex
*.java text diff=java trailing-space space-before-tab -indent-with-non-tab
*.pl text diff=perl trailing-space space-before-tab -indent-with-non-tab
*.php text diff=php
*.rb text diff=ruby trailing-space space-before-tab -indent-with-non-tab
*.vcproj eol=crlf
*.dsp eol=crlf
*.dsw eol=crlf
*.sh eol=lf
*.jpg binary
*.png binary
*.gif binary
*.tiff binary
您将要结束根据gitattributes man page正常化您的线路。另一个SO用户最终关闭了core.autocrlf
as well以获得干净的提交和补丁。
试图重现你的错误
$ git init repo
Initialized empty Git repository in c:/tmp/git-eol/repo/.git/
$ cd repo
$ git config --local core.autocrlf false
$ vim foo.txt
$ git add foo.txt
$ git commit -m "Add foo."
[master (root-commit) 3903abd] Add foo.
1 file changed, 3 insertions(+)
create mode 100644 foo.txt
$ vim foo.txt
$ git st
## master
M foo.txt
$ git commit -m "Add more foo." -a
[master 03e991a] Add more foo.
1 file changed, 2 insertions(+)
$ git format-patch HEAD~1
0001-Add-more-foo.patch
$ vim 0001-Add-more-foo.patch
望着那被制作补丁文件,我看到:
正如你所看到的,回车(^M
s)被保存在补丁中。这是与core.autocrlf=false
。继续,我看到:
$ git reset --hard HEAD~1
HEAD is now at 3903abd Add foo.
$ git am 0001-Add-more-foo.patch
Applying: Add more foo.
error: patch failed: foo.txt:1
error: foo.txt: patch does not apply
Patch failed at 0001 Add more foo.
The copy of the patch that failed is found in:
c:/tmp/git-eol/repo/.git/rebase-apply/patch
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
$ git am --abort
因此,该补丁不适用于开箱即用。使用--keep-cr
虽然如预期:
$ git am --keep-cr 0001-Add-more-foo.patch
Applying: Add more foo.
$
好吧。因此,让我们试试这个与core.autocrlf=true
(不同的版本库):
# Removed the initial commands...
$ git format-patch HEAD~1
0001-Add-more-foo.patch
$ git reset --hard HEAD~1
HEAD is now at 525b5aa Initial commit.
$ git am 0001-Add-more-foo.patch
Applying: Add more foo.
$ git config --get core.autocrlf
true
在这种情况下,补丁随处有LF结局。
你能告诉我们更多关于你运行的命令吗?你在运行什么操作系统? .gitattributes的内容是什么? – jszakmeister 2013-04-22 09:10:47