Re: [PATCH] git diff ignore-space options should ignore missing EOL at EOF differences

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 15, 2009, 14:55 UTC
Message-ID: <alpine.DEB.1.00.0902151554000.10279@pacific.mpi-cbg.de>
In-Reply-To: <9b18b3110902150609q13333619k98f87a4a36a09030@mail.gmail.com>

Hi,

On Sun, 15 Feb 2009, demerphq wrote:

>  t/t4015-diff-whitespace.sh             |   79 ++++++++++++++++++++++++++++++++

Phew, you certainly want to make sure that it works...

Show 18 quoted lines

> @@ -33,7 +33,14 @@ extern "C" {
>  #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3)
>  #define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4)
>  #define XDF_PATIENCE_DIFF (1 << 5)
> -#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE |
> XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL)
> +#define XDF_IGNORE_WHITESPACE_AT_EOF (1 << 6)
> +/*
> + * note this is deliberately a different define from XDF_WHITESPACE_FLAGS as
> + * there could be a new whitespace related flag which would not be part of
> + * the XDF_IGNORE_WHITESPACE_AT_EOF_ANY flags.
> + */
> +#define XDF_IGNORE_WHITESPACE_AT_EOF_ANY
> (XDF_IGNORE_WHITESPACE_AT_EOL | XDF_IGNORE_WHITESPACE_CHANGE |
> XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_AT_EOF)
> +#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE |
> XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL |
> XDF_IGNORE_WHITESPACE_AT_EOF)

As I told you on IRC, I do not follow that reasoning. Rather, I would add the exceptions to xemit.c, when -- and if(!) -- they are needed.

Ciao, Dscho