Merge branch 'en/and-cascade-tests'

diff --git a/diff.c b/diff.c
index c8e43664fb8c01ecba9cf74b3f9cbf5e8c1cbaea..c248bc64c57b3206905dd8e6f72a702073a137cc 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3894,7 +3894,7 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
 
                xpp.flags = 0;
                xecfg.ctxlen = 3;
-               xecfg.flags = XDL_EMIT_FUNCNAMES;
+               xecfg.flags = 0;
                xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data,
                              &xpp, &xecfg);
        }