mirror of
https://github.com/git/git
synced 2024-10-29 17:08:46 +00:00
Merge branch 'jc/maint-diffstat-numstat-context'
* jc/maint-diffstat-numstat-context: diff: teach --stat/--numstat to honor -U$num
This commit is contained in:
commit
7ddd582402
1 changed files with 2 additions and 0 deletions
2
diff.c
2
diff.c
|
@ -2274,6 +2274,8 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
|
||||||
memset(&xpp, 0, sizeof(xpp));
|
memset(&xpp, 0, sizeof(xpp));
|
||||||
memset(&xecfg, 0, sizeof(xecfg));
|
memset(&xecfg, 0, sizeof(xecfg));
|
||||||
xpp.flags = o->xdl_opts;
|
xpp.flags = o->xdl_opts;
|
||||||
|
xecfg.ctxlen = o->context;
|
||||||
|
xecfg.interhunkctxlen = o->interhunkcontext;
|
||||||
xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
|
xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
|
||||||
&xpp, &xecfg);
|
&xpp, &xecfg);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue