{"thread":{"id":"42818","subject":"Unexpected diff is shown with -w -b options in effect","startedAt":"2016-07-11T11:50:30Z","lastAt":"2016-07-11T12:58:18Z","messageCount":2,"participants":["KES","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"291165","messageId":"275091468237350@web16g.yandex.ru","threadId":"42818","inReplyTo":null,"subject":"Unexpected diff is shown with -w -b options in effect","fromName":"KES","fromEmail":"kes-kes@yandex.ru","sentAt":"2016-07-11T11:42:30Z","receivedAt":"2016-07-11T11:50:30Z","isPatch":false,"sender":{"key":"kes-kes@yandex.ru","avatar":null},"body":"Hi\n\nFor this diff\ndiff --git a/app/public/v2/index.html b/app/public/v2/index.html\nindex f73ba73..3af0c64 100644\n--- a/app/public/v2/index.html\n+++ b/app/public/v2/index.html\n@@ -21,11 +21,15 @@\n \n \n
\n-
\n-\t
MOV
\n-\t\n-\t\n-\t\n+
\n+\t
\n+\t\t
MOV
\n+\t\t\n+\t\t\n+\t
\n+\t
\n+\t\t\n+\t
\n
\n
\n
\n\nI see next:\ndiff --git a/app/public/v2/index.html b/app/public/v2/index.html\nindex f73ba73..d415c2d 100644\n--- a/app/public/v2/index.html\n+++ b/app/public/v2/index.html\n@@ -21,12 +21,16 @@\n \n \n
\n-
\n+
\n+
\n
MOV
\n
\n+
\n \n
\n+
<<<<<<<<<<<<<<<<<<<<<<<< IS NOT EXPECTED\n
\n
\n
\n\nBut I expect to see:\ndiff --git a/app/public/v2/index.html b/app/public/v2/index.html\nindex f73ba73..d415c2d 100644\n--- a/app/public/v2/index.html\n+++ b/app/public/v2/index.html\n@@ -21,12 +21,16 @@\n \n \n
\n-
\n+
\n+
\n
MOV
\n
\n+
\n \n+
<<<<<<<<<<<<<<<<<<<<<< EXPECT THIS\n
\n
\n
\n
\n\n\nThis seems to me a bug or should I apply some extra options to get expected behaviour?\n\nPS$ git --version\ngit version 2.8.1\n"},{"id":"291166","messageId":"alpine.DEB.2.20.1607111430190.6426@virtualbox","threadId":"42818","inReplyTo":"275091468237350@web16g.yandex.ru","subject":"Re: Unexpected diff is shown with -w -b options in effect","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2016-07-11T12:58:09Z","receivedAt":"2016-07-11T12:58:18Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi KES,\n\nOn Mon, 11 Jul 2016, KES wrote:\n\n> For this diff\n> diff --git a/app/public/v2/index.html b/app/public/v2/index.html\n> index f73ba73..3af0c64 100644\n> --- a/app/public/v2/index.html\n> +++ b/app/public/v2/index.html\n> @@ -21,11 +21,15 @@\n> \n> \n>
\n> -
\n> -\t
MOV
\n> -\t\n> -\t\n> -\t\n> +
\n> +\t
\n> +\t\t
MOV
\n> +\t\t\n> +\t\t\n> +\t
\n> +\t
\n> +\t\t\n> +\t
\n>
\n>
\n>
\n\nFirst of all, I ask you to realize that this diff makes it really, really\ntedious to see your problem (too much going on there that is completely\nunrelated to the bug: long lines, unnecessarily complex HTML code, too big\nof a diff to compare two versions of the diff).\n\nIt takes but a little time to clean it up, and then it is so much easier\nto make a case.\n\nAs to:\n\n> [...]\n> \n>
\n> +
<<<<<<<<<<<<<<<<<<<<<<<< IS NOT EXPECTED\n>
\n\nvs:\n\n> [...]\n> \n> +
<<<<<<<<<<<<<<<<<<<<<< EXPECT THIS\n>
\n>
\n\nYou asked for -w *and* for -b, i.e. ignore all white space *and* ignore\nwhite space change. The combination is bogus, of course, as \"ignore all\nwhite space\" includes \"ignore white space change\".\n\nIf you use only -b, you will see the expected change.\n\nIf you use -w, what you saw is actually expected, as git-diff was asked\nnot to see a difference between the indented vs the unindented
: it\nreally *ignores* all white space in that case. It is not like: ignore all\nwhite space except when there are ambiguous matches.\n\nCiao,\nJohannes\n"}]}