Merge branch 'jc/ignore-cr-at-eol'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:31 +0000 (11:06 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:31 +0000 (11:06 +0900)
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

1  2 
Documentation/diff-options.txt
Documentation/merge-strategies.txt
contrib/completion/git-completion.bash
diff.c
merge-recursive.c
t/t4015-diff-whitespace.sh
xdiff/xdiff.h
xdiff/xutils.c

Simple merge
Simple merge
diff --cc diff.c
--- 1/diff.c
--- 2/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);
Simple merge
Simple merge
diff --cc xdiff/xdiff.h
Simple merge
diff --cc xdiff/xutils.c
Simple merge