From: Eric Sunshine <sunshine@sunshineco.com>
To: Antoine Pelisse <apelisse@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, Git List <git@vger.kernel.org>
Subject: Re: [PATCH] diff: add --ignore-blank-lines option
Date: Sun, 9 Jun 2013 03:33:38 -0400 [thread overview]
Message-ID: <CAPig+cTGwhEEaY3th3++-CU9oeONTLohvY8E_zo25ypViUM=0Q@mail.gmail.com> (raw)
In-Reply-To: <1370724291-30088-1-git-send-email-apelisse@gmail.com>
On Sat, Jun 8, 2013 at 4:44 PM, Antoine Pelisse <apelisse@gmail.com> wrote:
> The goal of the patch is to introduce the GNU diff
> -B/--ignore-blank-lines as closely as possible. The short option is not
> available because it's already used for "break-rewrites".
>
> When this option is used, git-diff will not create hunks that simply
> adds or removes empty lines, but will still show empty lines
s/hunks/a hunk/
...or...
s/adds or removes/add or remove/
> addition/suppression if they are close enough to "valuable" changes.
>
> diff --git a/xdiff/xemit.c b/xdiff/xemit.c
> index d11dbf9..04b4bb1 100644
> --- a/xdiff/xemit.c
> +++ b/xdiff/xemit.c
> @@ -56,16 +56,49 @@ static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *
> /*
> * Starting at the passed change atom, find the latest change atom to be included
> * inside the differential hunk according to the specified configuration.
> + * Also advance xscr if the first changes must be discareded.
> */
s/discareded/discarded/
next prev parent reply other threads:[~2013-06-09 7:33 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 [this message]
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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPig+cTGwhEEaY3th3++-CU9oeONTLohvY8E_zo25ypViUM=0Q@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=apelisse@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).