Re: [PATCH] diff: add --ignore-blank-lines option

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Jun 9, 2013, 07:33 UTC
Message-ID: <CAPig+cTGwhEEaY3th3++-CU9oeONTLohvY8E_zo25ypViUM=0Q@mail.gmail.com>
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:

Show 6 quoted lines

> 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/

Show 12 quoted lines

> 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/