X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.c;h=e496905bad9853f912e1bbcc081c544524f8cb77;hb=4c61b7d15a6215fa4dffa33c37c3ef9df80d3f67;hp=5eae0947f35606eab6ff3421fe64fa5cb236f2ad;hpb=f4e96f97e85c145616bc2e23e9441bc0daa2906e;p=git.git

diff --git a/diff.c b/diff.c
index 5eae0947..e496905b 100644
--- a/diff.c
+++ b/diff.c
@@ -267,6 +267,7 @@ static void builtin_diff(const char *name_a,
 		ecbdata.label_path = lbl;
 		xpp.flags = XDF_NEED_MINIMAL;
 		xecfg.ctxlen = 3;
+		xecfg.flags = XDL_EMIT_FUNCNAMES;
 		if (!diffopts)
 			;
 		else if (!strncmp(diffopts, "--unified=", 10))
@@ -299,7 +300,7 @@ void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
 		   unsigned short mode)
 {
 	if (mode) {
-		spec->mode = DIFF_FILE_CANON_MODE(mode);
+		spec->mode = canon_mode(mode);
 		memcpy(spec->sha1, sha1, 20);
 		spec->sha1_valid = !!memcmp(sha1, null_sha1, 20);
 	}