blocks|key|3304456|text|检查空格。被替换的“空”外观行中有空格。您也可能意外地将制表符替换为空格，反之亦然。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3304457|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

Check spaces. The replaced "empty" looking lines have spaces in them. You may also have accidentally replaced tabs with spaces or vice versa.

blocks|key|1886560|text|这可能是空格的变化。您可以运行git+diff+-w，它将忽略任何空格更改。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1886561|entityMap^0|F|B|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|K|8|@]|D|@]|E|$]]]|G|$]]

It's probably whitespace changes. You can run <code>git diff -w</code>, which will ignore any whitespace changes.

blocks|key|1667519|text|除了空格/制表符之外，当从不同的编辑器(甚至在Windows上)和/或不同的vs输入行尾时，也会导致不同的行显示重复项；LF+(linux/Unix)与CRLF+(Windows)。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1667520|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

In addition to spaces/tabs, line endings when entered from different editors (even on Windows) and/or different OSs can contribute to diff lines showing duplicates; LF (linux/Unix) vs CRLF (Windows).

blocks|key|1887045|text|检查空格或行尾差异。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1887046|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

Check for spaces or line ending differences.

blocks|key|1667354|text|第二个版本的非空行在分号之后有一个空格，空行也有不同数量的空格。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1667355|应该有一个选项来让git突出显示这样的隐藏空间，以便差异更具信息性，但我手头没有手册。|1667356|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|$]]

The second version of the nonblank line has a space after the semicolon and the blank lines also have different numbers of spaces. 

There should be an option to have git highlight such hidden spaces so the diffs are more informative, but I don't have the manual handy.

blocks|key|3392479|text|因为在命令行输出中有时不会显示尾随空格，因此使用|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3392480|git+difftool|code-block|syntax|javascript|3392481|在通过git+config+--global+diff.tool+vimdiff指定vimdiff作为您的扩散工具之后，可能会有所帮助。|offset|length|style|CODE|3392482|entityMap^0|0|0|3|11|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|$]]

As trailing spaces are sometimes not shown in the command line output, using 

<pre><code>git difftool
</code></pre>

after specifying, e.g., vimdiff as your difftool via <code>git config --global diff.tool vimdiff</code> may help.

blocks|key|1667455|text|请注意，如果您正在使用新的-B选项，git+1.8.4+(July+2013)将不再只显示空行的更改。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1667456|1667457|+"git+diff“学习了一种模式，该模式忽略只包含添加和删除空行的块，这与GNU+diff的"diff+-B”(忽略空行)相同。|blockquote|1667458|1667459|1667460|请参阅commit+36617af7ed594d1928554356d809bd611c642dd2|1667461|1667462|补丁的目标是尽可能接近地引入GNU+diff+-B/--ignore-blank-lines。short选项不可用，因为它已用于"break-rewrites“。|1667463|1667464|当使用此选项时，git+diff不会创建简单地添加或删除空行的块，但如果空行足够接近“有价值”的更改，则仍然会显示空行的添加/取消。|1667465|下面是对该选项的更全面的描述：|1667466|1667467|块间真正的变化是指与感兴趣的变化足够接近(小于上下文大小)的interesting|1667468|blank行(在每个感兴趣的变化块周围使用递归definition)|unordered-list-item|1667469|
|1667470|"context“行|1667471|1667472|如果两个块之间的间隔小于”块间上下文“，则它们将被合并为一个块。|1667473|1667474|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/git/git/blob/master/Documentation/RelNotes/1.8.4.txt#L49-L51|1|https://github.com/git/git/commit/36617af7ed594d1928554356d809bd611c642dd2^0|D|2|I|L|0|0|0|2|8|1D|7|0|0|0|3|1B|1|0|0|N|N|1T|E|0|0|8|8|0|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|1J|8|@$9|1K|A|1L|B|C]]|D|@$9|1M|A|1N|1|1O]]|E|$]]|$1|F|3|-4|5|6|7|1P|8|@]|D|@]|E|$]]|$1|G|3|H|5|I|7|1Q|8|@$9|1R|A|1S|B|C]|$9|1T|A|1U|B|C]]|D|@]|E|$]]|$1|J|3|-4|5|6|7|1V|8|@]|D|@]|E|$]]|$1|K|3|-4|5|6|7|1W|8|@]|D|@]|E|$]]|$1|L|3|M|5|6|7|1X|8|@]|D|@$9|1Y|A|1Z|1|20]]|E|$]]|$1|N|3|-4|5|6|7|21|8|@]|D|@]|E|$]]|$1|O|3|P|5|I|7|22|8|@$9|23|A|24|B|C]|$9|25|A|26|B|C]]|D|@]|E|$]]|$1|Q|3|-4|5|6|7|27|8|@]|D|@]|E|$]]|$1|R|3|S|5|6|7|28|8|@$9|29|A|2A|B|C]]|D|@]|E|$]]|$1|T|3|U|5|6|7|2B|8|@]|D|@]|E|$]]|$1|V|3|-4|5|6|7|2C|8|@]|D|@]|E|$]]|$1|W|3|X|5|6|7|2D|8|@]|D|@]|E|$]]|$1|Y|3|Z|5|10|7|2E|8|@]|D|@]|E|$]]|$1|11|3|12|5|6|7|2F|8|@]|D|@]|E|$]]|$1|13|3|14|5|10|7|2G|8|@]|D|@]|E|$]]|$1|15|3|12|5|6|7|2H|8|@]|D|@]|E|$]]|$1|16|3|17|5|10|7|2I|8|@]|D|@]|E|$]]|$1|18|3|-4|5|6|7|2J|8|@]|D|@]|E|$]]|$1|19|3|-4|5|6|7|2K|8|@]|D|@]|E|$]]]|1A|$1B|$5|1C|1D|1E|E|$1F|1G]]|1H|$5|1C|1D|1E|E|$1F|1I]]]]

Note that <a href="https://github.com/git/git/blob/master/Documentation/RelNotes/1.8.4.txt#L49-L51" rel="nofollow">git 1.8.4 (July 2013)</a> will no longer show you changes with only empty lines, if you are using the new <code>-B</code> option.

<blockquote>
 "<code>git diff</code>" learned a mode that ignores hunks whose change consists only of additions and removals of blank lines, which is the same as "<code>diff -B</code>" (ignore blank lines) of GNU diff.
</blockquote>

See <a href="https://github.com/git/git/commit/36617af7ed594d1928554356d809bd611c642dd2" rel="nofollow">commit 36617af7ed594d1928554356d809bd611c642dd2</a>:

<blockquote>
 The goal of the patch is to introduce the GNU diff <code>-B/--ignore-blank-lines</code> as closely as possible. The short option is not available because it's already used for "<code>break-rewrites</code>".
 
 When this option is used, <code>git diff</code> will not create hunks that simply add or remove empty lines, but will still show empty lines addition/suppression if they are close enough to "valuable" changes.
 
 here is a more thorough description of the option:
 
 <ul>
 <li>real changes are interesting</li>
 <li>blank lines that are close enough (less than context size) to
 interesting changes are considered interesting (recursive definition)</li>
 <li>"context" lines are used around each hunk of interesting changes</li>
 <li>If two hunks are separated by less than "inter-hunk-context", they
 will be merged into one.</li>
 </ul>
</blockquote>

blocks|key|3304697|text|这有时会发生，因为git使用的默认diff算法使用启发式方法来剔除昂贵的边缘情况，这可能会导致次优结果。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3304698|我遇到了一个相同的问题，由于空格、行尾等原因，我无法解释。git+diff显示了一个特定的行，该行被删除，然后重新添加，作为块的一部分，显示为删除了3行，添加了2行，但实际上是删除了2行，添加了1行。其他diff程序显示了预期的2行删除和1行添加。|offset|length|style|CODE|3304699|发生这种情况的文件有4736行(114KB)，差异总计为640次插入和1340次删除，其中有问题的块位于文件的中间。我无法将其简化为一个较小的测试用例，该测试用例显示了相同的问题:在任何地方进行最轻微的干扰都会使问题消失。我唯一的结论是，我陷入了diff算法启发式的边缘案例之一。|3304700|除了默认设置之外，Git还支持multiple+other+diff+algorithms。通过将算法切换到minimal、patience或histogram中的任何一个，我的问题在这种情况下就解决了。|3304701|另请参阅git源代码中的this+comment，来自嵌入式LibXDiff库。|3304702|entityMap|0|LINK|mutability|MUTABLE|url|https://git-scm.com/docs/diff-options/2.8.2|1|https://github.com/git/git/blob/master/xdiff/xdiffi.c#L37^0|0|T|8|0|0|1I|7|1Q|8|1Z|9|F|U|0|0|C|C|1|0^^$0|@$1|2|3|4|5|6|7|X|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Y|8|@$D|Z|E|10|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|11|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|12|8|@$D|13|E|14|F|G]|$D|15|E|16|F|G]|$D|17|E|18|F|G]]|9|@$D|19|E|1A|1|1B]]|A|$]]|$1|L|3|M|5|6|7|1C|8|@]|9|@$D|1D|E|1E|1|1F]]|A|$]]|$1|N|3|-4|5|6|7|1G|8|@]|9|@]|A|$]]]|O|$P|$5|Q|R|S|A|$T|U]]|V|$5|Q|R|S|A|$T|W]]]]

This can sometimes happen because the default diff algorithm used by git uses a heuristic to cut out expensive edge cases, which can result in suboptimal results.

I ran into an identical issue to this that I couldn't explain due to whitespace, line endings, etc. <code>git diff</code> was showing a particular line that was deleted and then re-added, as part of a hunk that was displayed as 3 lines deleted and 2 lines added but was in reality 2 lines deleted and 1 line added. Other diff programs showed the expected 2 lines deleted and 1 line added.

The file in which this happened was 4736 lines (114 KB), with diffs totaling as 640 insertions and 1340 deletions, with the hunk in question being in the middle of the file. I was unable to reduce it to a smaller test case that exhibited the same problem: making the slightest perturbations anywhere made the problem go away. My only conclusion is that I was falling into one of these edge cases of the diff algorithm's heuristic.

Git supports <a href="https://git-scm.com/docs/diff-options/2.8.2" rel="nofollow noreferrer">multiple other diff algorithms</a> besides the default. By switching the algorithm to any of <code>minimal</code>, <code>patience</code>, or <code>histogram</code>, my problem went away in this case.

See also <a href="https://github.com/git/git/blob/master/xdiff/xdiffi.c#L37" rel="nofollow noreferrer">this comment</a> in the git source code, from the embedded LibXDiff library.

I accidently worked on the master where I had to open up a new branch.

I reverted it to its original form almost completely. At one class I get the following diff that I can not make sense out of.

<pre><code>index 4a9abb8..7c55879 100755
--- a/includes/site.inc.php
+++ b/includes/site.inc.php
@@ -142,11 +142,11 @@ class site{

 public $tplEngine = 'smarty';

-
+ 
 private $_productsByType = array();
 private $logger;
- protected $locale = 'tr_TR';
-
+ protected $locale = 'tr_TR'; 
+ 
</code></pre>

It says that I have deleted and added the same thing, in principle there is no difference with the original index and I don't want this file to be seen as modified.

What should I do ? Thx.

git diff, shows the same line as both deleted and added

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

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

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

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

文章

问答

视频

教程

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

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

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

腾讯云数据库专区

腾讯云智能顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

聚焦“写作效率、视觉美观与运行性能”三方面进行全面升级，为您提供更高效、稳定的创作环境

社区富文本&Markdown编辑器全新改版上线，欢迎大家体验!

诚挚邀请您参与本次调研，分享您的真实使用感受与建议。您的反馈至关重要，感谢您的支持与参与！

社区新版编辑器体验调研

我不小心在母机上工作，我不得不开一个新的分支机构。我几乎完全恢复了它的原始形式。在一节课上，我得到了以下我无法理解的差异。index 4a9abb8..7c55879 100755--- a/includes/site.inc.php+++ b/includes/site.inc.php@@ -142,11 +142,11 @@ class site{        public $tplEngi

问git diff，显示与已删除和已添加相同的行
EN

回答 8

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问git diff，显示与已删除和已添加相同的行EN

回答 8

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问git diff，显示与已删除和已添加相同的行
EN