From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: KES <kes-kes@yandex.ru>
Cc: git <git@vger.kernel.org>
Subject: Re: Unexpected diff is shown with -w -b options in effect
Date: Mon, 11 Jul 2016 14:58:09 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.20.1607111430190.6426@virtualbox> (raw)
In-Reply-To: <275091468237350@web16g.yandex.ru>
Hi KES,
On Mon, 11 Jul 2016, KES wrote:
> For this diff
> diff --git a/app/public/v2/index.html b/app/public/v2/index.html
> index f73ba73..3af0c64 100644
> --- a/app/public/v2/index.html
> +++ b/app/public/v2/index.html
> @@ -21,11 +21,15 @@
> </head>
> <body>
> <div id="media-width-detection-element"></div>
> -<div id="rowTools" class="eRowTools btn-group btn-group-sm">
> - <div type="button" class="eBtnMov btn btn-default">MOV</div>
> - <button type="button" class="eBtnAdd btn btn-default" onclick="rowTools_add_click( this )">ADD</button>
> - <button type="button" class="eBtnDel btn btn-default" onclick="rowTools_del_click( this )">DEL</button>
> - <img src="img/add.png"/>
> +<div id="rowTools" class="eRowTools">
> + <div class="eRow_Separator btn-group btn-group-sm">
> + <div type="button" class="eBtnMov btn btn-default">MOV</div>
> + <button type="button" class="eBtnAdd btn btn-default" onclick="rowTools_add_click( this )">ADD</button>
> + <button type="button" class="eBtnDel btn btn-default" onclick="rowTools_del_click( this )">DEL</button>
> + </div>
> + <div class="eRow_ColAdd">
> + <img src="img/add.png"/>
> + </div>
> </div>
> <div id="colTools" class="eColTools"></div>
> <div class="container-fluid">
First of all, I ask you to realize that this diff makes it really, really
tedious to see your problem (too much going on there that is completely
unrelated to the bug: long lines, unnecessarily complex HTML code, too big
of a diff to compare two versions of the diff).
It takes but a little time to clean it up, and then it is so much easier
to make a case.
As to:
> [...]
> <img src="img/add.png"/>
> </div>
> +</div> <<<<<<<<<<<<<<<<<<<<<<<< IS NOT EXPECTED
> <div id="colTools" class="eColTools"></div>
vs:
> [...]
> <img src="img/add.png"/>
> + </div> <<<<<<<<<<<<<<<<<<<<<< EXPECT THIS
> </div>
> <div id="colTools" class="eColTools"></div>
You asked for -w *and* for -b, i.e. ignore all white space *and* ignore
white space change. The combination is bogus, of course, as "ignore all
white space" includes "ignore white space change".
If you use only -b, you will see the expected change.
If you use -w, what you saw is actually expected, as git-diff was asked
not to see a difference between the indented vs the unindented </div>: it
really *ignores* all white space in that case. It is not like: ignore all
white space except when there are ambiguous matches.
Ciao,
Johannes
prev parent reply other threads:[~2016-07-11 12:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-11 11:42 Unexpected diff is shown with -w -b options in effect KES
2016-07-11 12:58 ` Johannes Schindelin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.20.1607111430190.6426@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=kes-kes@yandex.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).