From: Junio C Hamano <junkio@cox.net>
Date: Thu, 29 Jun 2006 05:49:42 +0000 (-0700)
Subject: diff.c: fix get_patch_id()
X-Git-Tag: v1.4.1~12^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9fdc3bb5c20e37e410e03ed5b6c71a7e647ccee8;p=git.git

diff.c: fix get_patch_id()

The function internally generated diff to get the patch id but
passed a wrong emit flags to the xdiff layer when it did so.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/diff.c b/diff.c
index afb629e61..5a71489a4 100644
--- a/diff.c
+++ b/diff.c
@@ -2217,7 +2217,7 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
 
 		xpp.flags = XDF_NEED_MINIMAL;
 		xecfg.ctxlen = 3;
-		xecfg.flags = 3;
+		xecfg.flags = XDL_EMIT_FUNCNAMES;
 		ecb.outf = xdiff_outf;
 		ecb.priv = &data;
 		xdl_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);