Merge branch 'bb/unicode-12.1-reiwa'

[thirdparty/git.git] / line-log.c

diff --git a/line-log.c b/line-log.c
index 59248e37cc3cec8fd309df77fb58b09c8612f336..0a17b21187b6620c3c5c82e53271d56bc0c6deb8 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -498,7 +498,7 @@ static struct commit *check_single_commit(struct rev_info *revs)
 
 static void fill_blob_sha1(struct commit *commit, struct diff_filespec *spec)
 {
-       unsigned mode;
+       unsigned short mode;
        struct object_id oid;
 
        if (get_tree_entry(&commit->object.oid, spec->path, &oid, &mode))