mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 02:17:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/maint-diffstat-numstat-context' into maint

Browse Source 
* jc/maint-diffstat-numstat-context:
  diff: teach --stat/--numstat to honor -U$num
This commit is contained in:
Junio C Hamano 2011-11-01 16:10:56 -07:00
commit eee947fb95
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@ -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);
} }