X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.c;h=f43b581f41617af61d985fe1f07e99c45f5ebcc5;hb=86c340e08287c0faad8871207787e5819f22a7d5;hp=f47bffa2a3641cbf69b2e6d3f0f6c93b05f2c716;hpb=2917e22496496dca8b42cf033ba3169c187c16fb;p=git.git

diff --git a/diff.c b/diff.c
index f47bffa2a..f43b581f4 100644
--- a/diff.c
+++ b/diff.c
@@ -2255,7 +2255,7 @@ static void builtin_diff(const char *name_a,
 		struct emit_callback ecbdata;
 		const struct userdiff_funcname *pe;
 
-		if (!DIFF_XDL_TST(o, WHITESPACE_FLAGS) || must_show_header) {
+		if (must_show_header) {
 			fprintf(o->file, "%s", header.buf);
 			strbuf_reset(&header);
 		}
@@ -3525,9 +3525,9 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
 	else if (!strcmp(arg, "--ignore-space-at-eol"))
 		DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
 	else if (!strcmp(arg, "--patience"))
-		DIFF_XDL_SET(options, PATIENCE_DIFF);
+		options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
 	else if (!strcmp(arg, "--histogram"))
-		DIFF_XDL_SET(options, HISTOGRAM_DIFF);
+		options->xdl_opts = DIFF_WITH_ALG(options, HISTOGRAM_DIFF);
 
 	/* flags options */
 	else if (!strcmp(arg, "--binary")) {