Merge branch 'jk/untracked-cache-more-fixes'

diff --git a/blame.h b/blame.h
index be3a895043e07a2508d407ac35e74d634acd7886..2a285eb027bf1a82b3b1b53f2bc04caebef86924 100644 (file)
--- a/blame.h
+++ b/blame.h
@@ -52,7 +52,7 @@ struct blame_origin {
        struct blame_entry *suspects;
        mmfile_t file;
        struct object_id blob_oid;
-       unsigned mode;
+       unsigned short mode;
        /* guilty gets set when shipping any suspects to the final
         * blame list instead of other commits
         */