Merge branch 'nd/merge-quit'

diff --git a/archive.c b/archive.c
index f2c78a2712b15505be7e0dae2e635b89c97082b8..53141c1f0ee12b4ce14efef1e4026d7ba7d2b665 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -415,7 +415,7 @@ static void parse_treeish_arg(const char **argv,
 
        if (prefix) {
                struct object_id tree_oid;
-               unsigned int mode;
+               unsigned short mode;
                int err;
 
                err = get_tree_entry(&tree->object.oid, prefix, &tree_oid,