From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Nov 2017 02:06:31 +0000 (+0900)
Subject: Merge branch 'jc/ignore-cr-at-eol'
X-Git-Tag: v2.16.0-rc0~106
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/10f65c239a885336b745cc9d2e1654980ffef41e

Merge branch 'jc/ignore-cr-at-eol'

The "diff" family of commands learned to ignore differences in
carriage return at the end of line.

* jc/ignore-cr-at-eol:
diff: --ignore-cr-at-eol
xdiff: reassign xpparm_t.flags bits
---

10f65c239a885336b745cc9d2e1654980ffef41e
diff --cc diff.c
index 0763e89263,dd14e4190c..2ebe2227b4
--- a/diff.c
+++ b/diff.c
@@@ -4129,17 -3434,15 +4129,15 @@@ void diff_setup_done(struct diff_option
  	 * inside contents.
  	 */
  
- 	if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
- 	    DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) ||
- 	    DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL))
+ 	if ((options->xdl_opts & XDF_WHITESPACE_FLAGS))
 -		DIFF_OPT_SET(options, DIFF_FROM_CONTENTS);
 +		options->flags.diff_from_contents = 1;
  	else
 -		DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS);
 +		options->flags.diff_from_contents = 0;
  
 -	if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
 +	if (options->flags.find_copies_harder)
  		options->detect_rename = DIFF_DETECT_COPY;
  
 -	if (!DIFF_OPT_TST(options, RELATIVE_NAME))
 +	if (!options->flags.relative_name)
  		options->prefix = NULL;
  	if (options->prefix)
  		options->prefix_length = strlen(options->prefix);