Merge branch 'vn/xmmap-gently' into maint

diff --git a/builtin/rm.c b/builtin/rm.c
index db85b339823cc0aa5ab5d03220335d4e4240d656..90cbe896c99188130a36a18aa18a57cd080be591 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -110,7 +110,7 @@ static int check_local_mod(struct object_id *head, int index_only)
                const struct cache_entry *ce;
                const char *name = list.entry[i].name;
                struct object_id oid;
-               unsigned mode;
+               unsigned short mode;
                int local_changes = 0;
                int staged_changes = 0;