Merge branch 'en/merge-directory-renames'

diff --git a/sha1-name.c b/sha1-name.c
index 07c71a7567012aedc7faeccfa5c89cf2363d42c0..7754d3a3deb9b92d4c9ac1e62bec9dcbc9aea585 100644 (file)
--- a/sha1-name.c
+++ b/sha1-name.c
@@ -1608,7 +1608,7 @@ static void diagnose_invalid_oid_path(const char *prefix,
                                      int object_name_len)
 {
        struct object_id oid;
-       unsigned mode;
+       unsigned short mode;
 
        if (!prefix)
                prefix = "";