Merge branch 'jh/trace2'

diff --git a/tree-diff.c b/tree-diff.c
index e6d306f69f940edd9613de0b38ffe2d9993f91ab..f1f641eb6a64abc2dbb6f0ef70f7375101874812 100644 (file)
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -181,7 +181,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p,
        struct tree_desc *t, struct tree_desc *tp,
        int imin)
 {
-       unsigned mode;
+       unsigned short mode;
        const char *path;
        const struct object_id *oid;
        int pathlen;