Merge branch 'js/bundle-verify-require-object-store'

diff --git a/builtin/update-index.c b/builtin/update-index.c
index 890c251d665a1b6800b87cc6ee0fcb04a3f9f538..27db0928bf052b0c518bee57ffa7cdd6c03d5d85 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -597,7 +597,7 @@ static struct cache_entry *read_one_ent(const char *which,
                                        struct object_id *ent, const char *path,
                                        int namelen, int stage)
 {
-       unsigned mode;
+       unsigned short mode;
        struct object_id oid;
        struct cache_entry *ce;