Merge branch 'tz/git-svn-doc-markup-fix'

diff --git a/cache.h b/cache.h
index e928fe9d3bd90b3ac2ca69bd31d281784287d536..9f2fb7b2ea428a8e747abb92d54811d62a18012b 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1333,7 +1333,7 @@ static inline int hex2chr(const char *s)
 #define FALLBACK_DEFAULT_ABBREV 7
 
 struct object_context {
-       unsigned mode;
+       unsigned short mode;
        /*
         * symlink_path is only used by get_tree_entry_follow_symlinks,
         * and only for symlinks that point outside the repository.