summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 982b64e)
raw | patch | inline | side by side (parent: 982b64e)
author | Junio C Hamano <junkio@cox.net> | |
Thu, 29 Jun 2006 05:49:42 +0000 (22:49 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Thu, 29 Jun 2006 05:49:42 +0000 (22:49 -0700) |
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>
passed a wrong emit flags to the xdiff layer when it did so.
Signed-off-by: Junio C Hamano <junkio@cox.net>
diff.c | patch | blob | history |
index afb629e613e0bcd8034e1701e77f7e16229139d4..5a71489a471568fb3aa51af5d74fa269ec4fadf1 100644 (file)
--- 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);