X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.c;h=d922b77aef2da84824a8e14fc21961e36e6d2e36;hb=5c8eeb83dbba11d7e41758b7a8dcb2da6a2025ba;hp=fcc0078074c364d0a4c2bd75a6d390e517eb7f87;hpb=7c4f050ae1e140a81f66b5cf92ad2c8673cfda8b;p=git.git

diff --git a/diff.c b/diff.c
index fcc007807..d922b77ae 100644
--- a/diff.c
+++ b/diff.c
@@ -2274,6 +2274,8 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
 		memset(&xpp, 0, sizeof(xpp));
 		memset(&xecfg, 0, sizeof(xecfg));
 		xpp.flags = o->xdl_opts;
+		xecfg.ctxlen = o->context;
+		xecfg.interhunkctxlen = o->interhunkcontext;
 		xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
 			      &xpp, &xecfg);
 	}
@@ -3385,6 +3387,10 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
 	}
 
 	/* xdiff options */
+	else if (!strcmp(arg, "--minimal"))
+		DIFF_XDL_SET(options, NEED_MINIMAL);
+	else if (!strcmp(arg, "--no-minimal"))
+		DIFF_XDL_CLR(options, NEED_MINIMAL);
 	else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
 		DIFF_XDL_SET(options, IGNORE_WHITESPACE);
 	else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))