merge-recursive: restore accidentally dropped setting of path

diff --git a/cache.h b/cache.h
index ac92421f3a8bc814da3f01731f2d8d8a52dc8364..851c3e694505791c5c971cb4220dbe7002e5f903 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1331,7 +1331,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.