summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-06-28 22:49:42 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-28 22:49:42 -0700
commit9fdc3bb5c20e37e410e03ed5b6c71a7e647ccee8 (patch)
tree6098ae4ec4461fe9df29c01e8ffb77cc52925efc
parentt4014: fix test commit labels. (diff)
downloadtgif-9fdc3bb5c20e37e410e03ed5b6c71a7e647ccee8.tar.xz
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>
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index afb629e613..5a71489a47 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);