Re: [PATCH 1/2] diff: change semantics of "ignore whitespace" options

From: Junio C Hamano <gitster@pobox.com>
Date: May 25, 2009, 18:48 UTC
Message-ID: <7vhbz9vx1y.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20090525110429.GB27070@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 9 quoted lines

>> +	if ((XDF_IGNORE_WHITESPACE|
>> +	     XDF_IGNORE_WHITESPACE_CHANGE|
>> +	     XDF_IGNORE_WHITESPACE_AT_EOL) & options->xdl_opts) {
>> +		DIFF_OPT_SET(options, DIFF_FROM_CONTENTS);
>> +	} else {
>> +		DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS);
>> +	}
>
> We have DIFF_XDL_TST these days;...

Heh, nobody seems to use it though.

Now the part reads

	if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
	    DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) ||
	    DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL))
		DIFF_OPT_SET(options, DIFF_FROM_CONTENTS);
	else
		DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS);

Thanks.