blocks|key|3411812|text|显然，GUI++that+files+end+with+a+newline+when+staging+individual+lines。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|3411813|我非常肯定，至少在某个时间点，即使没有文件末尾的换行符，也可以分阶段执行单独的行，但显然这已经不可能了。只是我自己遇到了这个问题，文件末尾有新行修复了它，并且删除它们会导致问题的发生。|3411814|entityMap|0|LINK|mutability|MUTABLE|url|http://git.661346.n2.nabble.com/Bug-in-Git-Gui-Creates-corrupt-patch-td2384251.html^0|7|1O|0|0|0^^$0|@$1|2|3|4|5|6|7|N|8|@]|9|@$A|O|B|P|1|Q]]|C|$]]|$1|D|3|E|5|6|7|R|8|@]|9|@]|C|$]]|$1|F|3|-4|5|6|7|S|8|@]|9|@]|C|$]]]|G|$H|$5|I|J|K|C|$L|M]]]]

Apparently Git GUI <a href="http://git.661346.n2.nabble.com/Bug-in-Git-Gui-Creates-corrupt-patch-td2384251.html">requires that files end with a newline when staging individual lines</a>.

I'm pretty sure that at at least one point in time, staging individual lines was ok even without a newline at the end of the file, but apparently that's no longer possible. Just ran into this problem myself, having newlines at the end of the file fixes it, and removing them causes it.

blocks|key|4293145|text|当使用的块太大(即修改了太多连续行)时，GUI无法从索引中添加/删除行。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|4293146|我的解决办法是:如果更改不是“粉红墙”(如果在块中间有一些未经修改的行)，则转到编辑>选项，并在diffs上下文中减少行数。如果这不起作用，您就完了；使用其他工具(例如命令行)。|4293147|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|F|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|G|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|H|8|@]|9|@]|A|$]]]|E|$]]

Git GUI fails to add/remove lines from the index when the chunk you are working with is too big (i.e. too many successive lines modified).

My workaround : if the changes are not a "wall of pink" (if there are some unmodified lines in the middle of the chunk), go to edit > options and reduce the number of lines in the context of diffs. If this doesn't work, you are screwed ; use an other tool (like the command line for instance).

blocks|key|4293175|text|在kyl191回答的启发下，我想出了一个解决这个问题的简单方法：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|4293176|将换行符添加到文件末尾|ordered-list-item|4293177|保存所有变化
git藏物|4293178|将换行符再一次添加到文件末尾，以便在当前文件和隐藏版本中都有换行符。|4293179|阶段相应的宏(只包含您的换行符)
git阶段|4293180|从藏匿处取出您的更改
藏弹|4293181|4293182|4293183|现在，您应该能够通过gui生成单行，而不会出现此错误。这是因为在您只进行了包含部分的换行符之后，从存储中恢复的版本的差异已经看到了一个以换行符结尾的文件。|4293184|entityMap^0|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|T|8|@]|9|@]|A|$]]|$1|E|3|F|5|D|7|U|8|@]|9|@]|A|$]]|$1|G|3|H|5|D|7|V|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|W|8|@]|9|@]|A|$]]|$1|K|3|L|5|D|7|X|8|@]|9|@]|A|$]]|$1|M|3|-4|5|6|7|Y|8|@]|9|@]|A|$]]|$1|N|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]|$1|O|3|P|5|6|7|10|8|@]|9|@]|A|$]]|$1|Q|3|-4|5|6|7|11|8|@]|9|@]|A|$]]]|R|$]]

Inspired by kyl191's answer I came up with a simple solution for this problem:

<ol>
<li>add newline character to the end of your file</li>
<li>stash all changes

<pre><code>git stash
</code></pre></li>
<li>add newline character to the end of your file once again, so you have a newline character in your current file as well as in your stashed version</li>
<li>stage the corresponding hunk (contains just your newline)

<pre><code>git stage &lt;your file&gt;
</code></pre></li>
<li>pop your changes from stash

<pre><code>git stash pop
</code></pre></li>
</ol>

Now you should be able to stage single lines via gui without this error. This works because after you staged just the newline containing part, the diff to the version recovered from stash already sees a file wich ends with a newline character.

blocks|key|3411892|text|实际上，这经常发生在编辑“-”行时。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3411893|当您删除'-‘并忘记添加’(空格)而不是‘时，|3411894|或者，错误地，您添加了两个空格，并使用‘制表符’作为虚设。|3411895|打开修补程序，检查所有想要保持不变的行都是以“”(一个空格)开始的。|3411896|我看到有些人使用--ignore-space-change+--ignore-whitespace+--whitespace=fix作为解决方法，但这是另一件您不能混为一谈的事情。|offset|length|style|CODE|3411897|打开修补程序，检查所有想要保持不变的行都是以“”(空格)开头的。|3411898|UPD|BOLD|3411899|还可能您的编辑器有以下选项：“删除结束行上的空格”，因此，当您在编辑器中保存修补程序时：|3411900|-Line+with+space+at+end+<---+NOTICE:+Here+one+space+at+the+end
%2BLine+with+no+space+at+end<---+Here+no+space|code-block|syntax|javascript|3411901|您的编辑器删除了尾随空间，修补程序如下所示：|3411902|-Line+with+space+at+end<---+Here+no+space.+Patch+will+FAIL!!!
%2BLine+with+no+space+at+end<---+Here+no+space+also|3411903|此修补程序将失败，因为原始文件没有行：|3411904|-Line+with+space+at+end<---|3411905|它包括：|3411906|-Line+with+space+at+end+<---+|3411907|UPD2|3411908|所以如果在下一行的补丁中|3411909|android:tileMode="repeat"|3411910|您的编辑器移除训练空间。补丁会失败|3411911|entityMap^0|0|0|0|0|8|L|U|J|1E|G|0|0|0|3|0|0|0|0|0|0|0|0|0|0|4|0|0|0|0^^$0|@$1|2|3|4|5|6|7|1L|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|1M|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|1N|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|1O|8|@]|9|@]|A|$]]|$1|H|3|I|5|6|7|1P|8|@$J|1Q|K|1R|L|M]|$J|1S|K|1T|L|M]|$J|1U|K|1V|L|M]]|9|@]|A|$]]|$1|N|3|O|5|6|7|1W|8|@]|9|@]|A|$]]|$1|P|3|Q|5|6|7|1X|8|@$J|1Y|K|1Z|L|R]]|9|@]|A|$]]|$1|S|3|T|5|6|7|20|8|@]|9|@]|A|$]]|$1|U|3|V|5|W|7|21|8|@]|9|@]|A|$X|Y]]|$1|Z|3|10|5|6|7|22|8|@]|9|@]|A|$]]|$1|11|3|12|5|W|7|23|8|@]|9|@]|A|$X|Y]]|$1|13|3|14|5|6|7|24|8|@]|9|@]|A|$]]|$1|15|3|16|5|W|7|25|8|@]|9|@]|A|$X|Y]]|$1|17|3|18|5|6|7|26|8|@]|9|@]|A|$]]|$1|19|3|1A|5|W|7|27|8|@]|9|@]|A|$X|Y]]|$1|1B|3|1C|5|6|7|28|8|@$J|29|K|2A|L|R]]|9|@]|A|$]]|$1|1D|3|1E|5|6|7|2B|8|@]|9|@]|A|$]]|$1|1F|3|1G|5|W|7|2C|8|@]|9|@]|A|$X|Y]]|$1|1H|3|1I|5|6|7|2D|8|@]|9|@]|A|$]]|$1|1J|3|-4|5|6|7|2E|8|@]|9|@]|A|$]]]|1K|$]]

Actually, this often happens when you edit '-' lines. 
When you remove '-' and forget to add ' ' (space) instead of it

Or, by mistake, you add two spaces and you use 'tabs' as identation

Open your patch and check that all lines you want to leave untouched are started with ' ' (one space)

I have saw that some people use <code>--ignore-space-change</code> <code>--ignore-whitespace</code> <code>--whitespace=fix</code> as workaround but this is another thing you must not mix into.

Open your patch and check that all lines you want to leave untouched are started with ' ' (space)

UPD

it also possible your editor has option: "Delete spaces at end line"
So, when you in your editor save patch:

<pre><code>-Line with space at end &lt;--- NOTICE: Here one space at the end
+Line with no space at end&lt;--- Here no space
</code></pre>

Your editor remove trailing space and patch become like this:

<pre><code>-Line with space at end&lt;--- Here no space. Patch will FAIL!!!
+Line with no space at end&lt;--- Here no space also
</code></pre>

This patch will FAIL because origin file has no line:

<pre><code>-Line with space at end&lt;---
</code></pre>

it has:

<pre><code>-Line with space at end &lt;--- 
</code></pre>

UPD2

So if in your patch in next line

<pre><code>android:tileMode="repeat"
</code></pre>

Your editor remove trainling space. Patch will FAIL

blocks|key|4293249|text|我是在装船的时候发现这个错误的。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|4293250|这里提到的“空格”提醒我，在我的git选项中，有"-w"，它在扩散时跳过空白。|4293251|我移除了那个标志(使用了git-gui的“选项.”)，并且能够在没有错误的情况下完成任务。然后，我将其添加回(因为我通常不希望在检查已更改的内容时看到空格的差异)。|4293252|不确定这会对你有帮助，但它是相当无害的尝试和很容易撤销。|4293253|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|J|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|K|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|L|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|M|8|@]|9|@]|A|$]]|$1|H|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|I|$]]

I was getting this error while staging hunks.

The "whitespace" mentioned here reminded me that I have, in my git diff options, "-w", which skips white-space while diffing.

I removed that flag (using git-gui's "Options..."), and was able to stage hunks without the error. I then added it back (because I usually don't want to see whitespace diffs when examining what has changed).

Not sure this will help you but it's rather harmless to try and easy to undo.

blocks|key|4293270|text|我遇到了这个问题，因为我试图在emacs中添加一个新行到我的修补程序中，当我保存它时，它会自动删除末尾的换行符。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|4293271|如果您使用emacs向修补程序的末尾添加一个换行符，它可能也会再次删除它。我打开另一个文本编辑器来添加我的换行符，它起了作用。|4293272|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|F|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|G|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|H|8|@]|9|@]|A|$]]]|E|$]]

I had this problem because I tried to add a newline to my patch in emacs and it automatically removed the newline at the end again when I saved it. 

If you're using emacs to add a newline to the end of your patch, it may also be removing it again. I opened another text editor to add my newline and it worked.

I'm getting the following error when I'm trying to stage a single line or multiple lines using the git gui (right click -> stage lines for commit). It's not the first time it occure to me, and I've found others facing it.However I couldn't find how to solve it.

Did any one ever encountered this problem? is there something I can do (staging all the file is not a real solution)

Update:
Here is a file which gives me the following error when I try to stage the deleted line.

<pre><code>@@ -1,7 +1,6 @@
&lt;?xml version="1.0" encoding="utf-8"?&gt;
&lt;bitmap xmlns:android="http://schemas.android.com/apk/res/android" 
 android:src="@drawable/texture"
 android:tileMode="repeat"
- android:dither="true"
 &gt;
&lt;/bitmap&gt;
\ No newline at end of file
</code></pre>

Here is the error message:

<pre><code>fatal: corrupt patch at line 14
</code></pre>

strangely the following fine doesn't even have 14 line!? note ending file with a new line didn't solve the problem

"fatal: corrupt patch at line XX" when staging single line

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

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

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

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

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

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

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

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋 

腾讯云代码助手

CODING DevOps

Cloud Studio

SDK中心

API中心

命令行工具

当我试图使用gui分一行或多行时，我会得到以下错误(右击->阶段行进行提交)。这不是我第一次遇到这种情况，我发现其他人面对it.However，我找不到解决问题的方法。有没有人遇到过这个问题？有什么我能做的吗(暂放所有的文件不是真正的解决方案)更新:这里是一个文件，当我尝试删除行时，它会给出以下错误。@@ -1,7 +...

问分段单行时“致命:XX行处的损坏修补程序”
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问分段单行时“致命:XX行处的损坏修补程序”EN