aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-10 15:56:18 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-10 15:56:18 -0700
commit7ddd582402aa926d5ec33d914ccc8bfaf1b15c06 (patch)
tree4c17578024416e93f4d429608d7522c1b226778c /diff.c
parent034a8a0df392fa809a506d0da65b9245db939d8f (diff)
parentf01cae918feb564da8c7a286b32c7c917599acdd (diff)
downloadgit-7ddd582402aa926d5ec33d914ccc8bfaf1b15c06.tar.gz
git-7ddd582402aa926d5ec33d914ccc8bfaf1b15c06.tar.xz
Merge branch 'jc/maint-diffstat-numstat-context'
* jc/maint-diffstat-numstat-context: diff: teach --stat/--numstat to honor -U$num
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index fcc007807..eed227a6a 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);
}