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, 10 Jun 2013 14:43:27 -0700 [thread overview]
Message-ID: <7vsj0pej5s.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CALWbr2zLTUYRnaYxbjyU80zpa3Q6WGcquTPAHqWCJnbEZ7RNPQ@mail.gmail.com> (Antoine Pelisse's message of "Mon, 10 Jun 2013 23:03:28 +0200")
Antoine Pelisse <apelisse@gmail.com> writes:
> On Sun, Jun 9, 2013 at 10:07 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> When any ignore blank option is used, there will be lines that
>> actually has changes (hence should be shown with +/-) but we
>> deliberately ignore their changes (hence, if they ever appear in the
>> hunk, they do so as context lines prefixed with SP not +/-). When
>> we do so, we show the lines from the postimage in the context.
>
> Don't we actually use preimage (see below) ? I think using pre-image
> allows the patch to be applicable to another tree (but ignoring the
> space changes).
But the result of such patch application is not usually what you
want to use. If we use postimage (which by the way was a deliberate
design decision we made earlier), at least the review of the patch
is easier because you would see the end result more clearly.
> If we actually hide new blank lines that are in the context, it means
> that we won't be able to apply a patch with 2 new blank lines in the 3
> line context.
Yes, but I do not think the point of --ignore-blank-lines is to
produce a patch that can be applied in the first place. It is to
allow easier eyeballing.
> Anyway, I'm starting to think that "show blank lines changes near
> other changes" makes sense more and more sense.
Probably.
next prev parent reply other threads:[~2013-06-10 21:43 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 [this message]
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
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=7vsj0pej5s.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).