Merge branch 'js/rebase-deprecate-preserve-merges'

diff --git a/blame.c b/blame.c
index c11c516921e990e1b0fa752e77a1438e92697d5e..145eaf2faf9cf56977da61572c93783ea702b0f9 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -99,7 +99,7 @@ static void verify_working_tree_path(struct repository *r,
        for (parents = work_tree->parents; parents; parents = parents->next) {
                const struct object_id *commit_oid = &parents->item->object.oid;
                struct object_id blob_oid;
-               unsigned mode;
+               unsigned short mode;
 
                if (!get_tree_entry(commit_oid, path, &blob_oid, &mode) &&
                    oid_object_info(r, &blob_oid, NULL) == OBJ_BLOB)