From: Junio C Hamano <gitster@pobox.com>
To: Antoine Pelisse <apelisse@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: [PATCH] diff: add --ignore-blank-lines option
Date: Mon, 17 Jun 2013 16:27:03 -0700 [thread overview]
Message-ID: <7v38sgb9o8.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CALWbr2x0gxQ8boXEa3WJUbaA8e9imt9Ri_NFmANEhJuK6Moi+A@mail.gmail.com> (Antoine Pelisse's message of "Mon, 17 Jun 2013 23:33:08 +0200")
Antoine Pelisse <apelisse@gmail.com> writes:
> Re-reading note: OK, This last sentence ("If not we will eventually be
> too far and break") is actually a bug. We might break before we find
> something interesting while we should keep going. For example in such
> a case, we should display like this, but won't:
Glad to see that my question has helped ;-)
>> This is on the else side of if (!xch->ignore), so we are looking at
>> ignored hunk, which means there is only blank line change. Can chg2
>> be 0 while chg1 is not zero, i.e. xch being a blank line removal?
>
> Exactly. It can be a blank line removal. But I don't want to consider
> it in the calculation.
> Here's why:
> ...
> What should be the output of diff --ignore-blank-lines ?
>
> I chose this alternative:
> @@ -1,3 +1,4 @@
> +change
> 1
> 2
> 3
> @@ -7,3 +5,4 @@
> 4
> 5
> 6
> +change
>
> While one could have chosen:
> @@ -1,10 +1,8 @@
> +change
> 1
> 2
> 3
> -
> -
> -
> -
> 4
> 5
> 6
> +change
> ...
> Nothing is interesting here, we just leave the interesting zone (if
> not already left) because everything else failed.
Yes, that asymmetry is what I was wondering if we want to have. If
we show additional blanks as a significant event, I am not so sure
we can say "Nothing is interesting here".
I do not feel strongly either way, but it just felt somewhat
inconsistent.
Thanks.
next prev parent reply other threads:[~2013-06-17 23:27 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-26 17:58 [PATCH] diff: add --ignore-blank-lines option Antoine Pelisse
2013-05-26 20:35 ` Johannes Sixt
2013-05-27 7:14 ` Antoine Pelisse
2013-06-01 8:48 ` Antoine Pelisse
2013-06-04 18:26 ` Junio C Hamano
2013-06-04 19:08 ` Antoine Pelisse
2013-06-04 20:46 ` Junio C Hamano
2013-06-04 20:51 ` Antoine Pelisse
2013-06-08 20:44 ` Antoine Pelisse
2013-06-09 7:33 ` Eric Sunshine
2013-06-09 20:07 ` Junio C Hamano
2013-06-09 20:32 ` Antoine Pelisse
2013-06-09 21:28 ` Junio C Hamano
2013-06-10 21:03 ` Antoine Pelisse
2013-06-10 21:43 ` Junio C Hamano
2013-06-12 13:21 ` Antoine Pelisse
2013-06-12 17:22 ` Junio C Hamano
2013-06-15 13:01 ` Antoine Pelisse
2013-06-17 16:18 ` Junio C Hamano
2013-06-17 17:58 ` Antoine Pelisse
2013-06-17 19:09 ` Antoine Pelisse
2013-06-17 19:52 ` Junio C Hamano
2013-06-17 21:33 ` Antoine Pelisse
2013-06-17 23:27 ` Junio C Hamano [this message]
2013-06-19 18:46 ` Antoine Pelisse
2013-06-19 22:23 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v38sgb9o8.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=apelisse@gmail.com \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).