From: Junio C Hamano <gitster@pobox.com>
To: Antoine Pelisse <apelisse@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: [PATCH] Allow combined diff to ignore white-spaces
Date: Mon, 04 Mar 2013 10:36:51 -0800 [thread overview]
Message-ID: <7vy5e3vwos.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CALWbr2z0eok-VOQX7DDZafevQUi7asCv_tD8=y6XA2PVYf52AQ@mail.gmail.com> (Antoine Pelisse's message of "Mon, 4 Mar 2013 19:17:19 +0100")
Antoine Pelisse <apelisse@gmail.com> writes:
> It feels incorrect to me to coalsesce "- 5" and "- 5" as it might
> look incorrect to the user. But still the idea is appealing.
The users already need to see that when reading a regular patch with
one or more context lines and -b/-w/etc., anyway. The context lines
are made into context only because whitespace differences were
ignored, and in the regular unified patch format we can show only
one version, either from preimage or from postimage, and have to
pick one. Coalescing "- 5" and "- 5" into "--5" or "-- 5" by
picking one or the other is the same thing, no?
> Using the exact example you gave, and running the latest next, I have
> this output, where 11 is not coalesced.
> Is that a bug ?
It could be tickling a corner case because the removal is at the end
of the file. Perhaps adding 12 that is all common across three
versions and see what happens?
next prev parent reply other threads:[~2013-03-04 18:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-02 15:04 [PATCH] Allow combined diff to ignore white-spaces Antoine Pelisse
2013-03-03 7:45 ` Junio C Hamano
2013-03-04 18:17 ` Antoine Pelisse
2013-03-04 18:36 ` Junio C Hamano [this message]
2013-03-04 18:50 ` Antoine Pelisse
2013-03-13 21:21 ` Antoine Pelisse
2013-03-13 23:42 ` Junio C Hamano
2013-03-13 23:53 ` Junio C Hamano
2013-03-14 7:08 ` Johannes Sixt
2013-03-14 15:31 ` Junio C Hamano
2013-03-14 15:51 ` Antoine Pelisse
2013-03-14 21:03 ` [PATCH v3] " Antoine Pelisse
2013-03-14 21:43 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vy5e3vwos.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.
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).