From f01cae918feb564da8c7a286b32c7c917599acdd Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 22 Sep 2011 10:54:47 -0700 Subject: [PATCH] diff: teach --stat/--numstat to honor -U$num "git diff -p" piped to external diffstat and "git diff --stat" may see different patch text (both are valid and describe the same change correctly) when counting the number of added and deleted lines, arriving at different results to confuse the users, as --stat/--numstat codepath always uses the hardcoded -U0 as the context length. Make --stat/--numstat codepath to honor the context length the same way as the textual patch codepath does to avoid this problem. Signed-off-by: Junio C Hamano --- diff.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/diff.c b/diff.c index 9a5c77c13..d442c66e9 100644 --- a/diff.c +++ b/diff.c @@ -2096,6 +2096,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); } -- 2.26.2