Merge branch 'nd/no-extern'

diff --git a/builtin/mktree.c b/builtin/mktree.c
index 263c530315a4fe435a88f2042c768350f72e837b..2dc4ad6ba8f227a6a8a46bac62048959220411ec 100644 (file)
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -7,6 +7,7 @@
 #include "quote.h"
 #include "tree.h"
 #include "parse-options.h"
+#include "object-store.h"
 
 static struct treeent {
        unsigned mode;
@@ -116,7 +117,7 @@ static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_miss
        }
 
        /* Check the type of object identified by sha1 */
-       obj_type = oid_object_info(&oid, NULL);
+       obj_type = oid_object_info(the_repository, &oid, NULL);
        if (obj_type < 0) {
                if (allow_missing) {
                        ; /* no problem - missing objects are presumed to be of the right type */