blocks|key|606015|text|我也遇到了同样的问题|type|unstyled|depth|inlineStyleRanges|entityRanges|data|606016|git+rebase+--skip+|code-block|syntax|javascript|606017|很多次，直到看到No+rebase+in+progress?，然后再尝试使用git+am|offset|length|style|CODE|606018|entityMap^0|0|0|8|M|12|6|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Q|8|@$I|R|J|S|K|L]|$I|T|J|U|K|L]]|9|@]|A|$]]|$1|M|3|-4|5|6|7|V|8|@]|9|@]|A|$]]]|N|$]]

I had the same problem
You have a rebase in progress, write

<pre><code>git rebase --skip 
</code></pre>

many times, until see <code>No rebase in progress?</code>
then try again with <code>git am</code>

blocks|key|606051|text|我也有同样的问题：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|606052|fatal:+git+apply:+bad+git-diff+-+expected+/dev/null+on+line+47|code-block|syntax|javascript|606053|然而，第47行读取---+/dev/null。我发现的问题是，行尾是Windows格式，而不是UNIX格式。用Notepad%2B%2B将行尾转换为UNIX格式为我解决了这个问题。|offset|length|style|CODE|606054|entityMap^0|0|0|9|D|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Q|8|@$I|R|J|S|K|L]]|9|@]|A|$]]|$1|M|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|N|$]]

I also had the same problem:

<pre><code>fatal: git apply: bad git-diff - expected /dev/null on line 47
</code></pre>

Yet line 47 reads <code>--- /dev/null</code>. The problem I found was that the line endings were in Windows format instead of UNIX format. Converting the line endings to UNIX format in Notepad++ fixed the problem for me.

blocks|key|2716329|text|我也有过同样的问题。我打开了Git+Bash+(Cygwin工作也一样)，并做了：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2716330|dos2unix.exe+<patch-file>|code-block|syntax|javascript|2716331|然后我就能很好地应用这个补丁了。|2716332|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

I had the same issue. I opened up Git Bash (Cygwin works as well) and did:

<pre><code>dos2unix.exe &lt;patch-file&gt;
</code></pre>

Then I was able to apply the patch perfectly fine.

blocks|key|606092|text|我也遇到了同样的问题，但我正在测试我将要发送到列表服务器的修补程序，下面的建议是：https://www.kernel.org/doc/Documentation/email-clients.txt。我不能仅仅解决本地文件上的问题，我需要分发一个可能会被gmail破坏的修补程序，并且我正在用git+apply检查gmail版本。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|606093|我的同事向我指出|606094|git+am+|code-block|syntax|javascript|606095|在纠正这类问题方面比git+apply更好，并且应该与.patch文件一起使用。上面的一个评论提到了这一点，但它应该是一个答案。|606096|entityMap|0|LINK|mutability|MUTABLE|url|https://www.kernel.org/doc/Documentation/email-clients.txt^0|42|9|15|1M|0|0|0|0|A|9|R|6|0^^$0|@$1|2|3|4|5|6|7|W|8|@$9|X|A|Y|B|C]]|D|@$9|Z|A|10|1|11]]|E|$]]|$1|F|3|G|5|6|7|12|8|@]|D|@]|E|$]]|$1|H|3|I|5|J|7|13|8|@]|D|@]|E|$K|L]]|$1|M|3|N|5|6|7|14|8|@$9|15|A|16|B|C]|$9|17|A|18|B|C]]|D|@]|E|$]]|$1|O|3|-4|5|6|7|19|8|@]|D|@]|E|$]]]|P|$Q|$5|R|S|T|E|$U|V]]]]

I had the same issue, but I was testing a patch I was going to send to a listserve, following the recommendations here: <a href="https://www.kernel.org/doc/Documentation/email-clients.txt" rel="nofollow">https://www.kernel.org/doc/Documentation/email-clients.txt</a> . I couldn't just fix the problem on my local file, I needed to distribute a patch which was potentially going to be mangled by gmail and I was checking the gmailed version with <code>git apply</code>.

My co-worker pointed out to me that 

<pre><code>git am 
</code></pre>

Is better than <code>git apply</code> at correcting for these sorts of problems and is what should be used with <code>.patch</code> files. This is mentioned in one of the comments above but it should be an answer.

blocks|key|2716356|text|我也有过同样的问题。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2716357|fatal:+git+apply:+bad+git-diff+-+expected+/dev/null+on+line+96|offset|length|style|CODE|2716358|或者，如果我将所有行尾转换为Unix格式：|2716359|error:+patch+failed:+<file>:81
error:+<file>:+patch+does+not+apply
...|code-block|syntax|javascript|2716360|git+apply+--ignore-whitespace+<patch>.patch使用Unix行结束。|2716361|entityMap^0|0|0|1Q|0|0|0|0|17|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|T|8|@$D|U|E|V|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|W|8|@]|9|@]|A|$]]|$1|J|3|K|5|L|7|X|8|@]|9|@]|A|$M|N]]|$1|O|3|P|5|6|7|Y|8|@$D|Z|E|10|F|G]]|9|@]|A|$]]|$1|Q|3|-4|5|6|7|11|8|@]|9|@]|A|$]]]|R|$]]

I had the same issue.

<code>fatal: git apply: bad git-diff - expected /dev/null on line 96</code>

Or, if I convert all line-endings to Unix format:

<pre><code>error: patch failed: &lt;file&gt;:81
error: &lt;file&gt;: patch does not apply
...
</code></pre>

<code>git apply --ignore-whitespace &lt;patch&gt;.patch</code> worked with Unix line-endings.

So I was trying to use apply a diff file to my git dev branch. The diff I wanted to apply was this one here: <a href="https://github.com/mbabker/joomla-cms/compare/JHtml_move.patch">https://github.com/mbabker/joomla-cms/compare/JHtml_move.patch</a>

I used <code>git apply PATH_TO_PATCH.patch</code>

Now on trying to apply it I get a load of errors cumulating with a 

<pre><code>fatal: git apply: bad git-diff - expected /dev/null on line 47
</code></pre>

Thing is line 47 reads <code>--- /dev/null</code>

I saw on another forum somebody say there was a trailing white space after the <code>/dev/null</code> part but there isn't.

In case its any help I'm also being thrown errors of trailing white spaces on lines 9, 10, 11, 12 and 13 - despite their NOT being any trailing white spaces.

In any case the diff is being generated by git - I'm just copying and pasting it into notepad.

I've also tried using <code>curl https://github.com/mbabker/joomla-cms/compare/JHtml_move.patch | git am</code> but that just gives an error without specifying location.

<img src="https://i.stack.imgur.com/vdQYP.png" alt="Error message from curl attempt">

Any ideas as to why its giving an fatal error when the line actually exists????

<hr>

Update to @IvanZuzak
I tried adding in the <code>git am --ignore-space-change --ignore-whitespace PATH_TO_PATCH.patch</code> however I got first of all (as this was the downloaded patch) an error saying the email was invalid (it had been converted to html code) so I tried to fix that but it kept throwing it up every now and again. Then it said <code>previous rebase directory PATH_TO_GITHUB_BRANCH/.git/rebase-apply still exists but mbox given.</code>. So I found <a href="http://lilypond.1069038.n5.nabble.com/git-help-previous-rebase-directory-td104464.html">this</a> which suggested removing the rebase-apply folder in the branches .git folder. So I did that and then I got the invalid email error again (despite I'd changed both ones away from the html formatted)

Applying a diff file with git

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋 

腾讯云代码助手

CODING DevOps

Cloud Studio

SDK中心

API中心

命令行工具

因此，我试图将diff文件应用到我的git dev分支。我想申请的区别是这里的一个：我用了git apply PATH_TO_PATCH.patch现在，在尝试应用它时，我会得到大量的错误，这些错误累积在fatal: git apply: bad git-diff - expected /dev/null on lin...

问使用git应用diff文件
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问使用git应用diff文件EN