15 files changed, 23 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index 05ea71f..1c49b50 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.18.0
+GIT_VER = 2.19.1
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/cgit.h b/cgit.h
index 32dfd7a..bcc4fce 100644
--- a/cgit.h
+++ b/cgit.h
@@ -8,6 +8,7 @@
 #include <cache.h>
 #include <grep.h>
 #include <object.h>
+#include <object-store.h>
 #include <tree.h>
 #include <commit.h>
 #include <tag.h>
diff --git a/git b/git
-Subproject 53f9a3e157dbbc901a02ac2c73346d375e24978
+Subproject cae598d9980661a978e2df4fb338518f7bf0957
diff --git a/parsing.c b/parsing.c
index 9e73e70..7b3980e 100644
--- a/parsing.c
+++ b/parsing.c
@@ -129,7 +129,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
         const int sha1hex_len = 40;
         struct commitinfo *ret;
-        const char *p = get_cached_commit_buffer(commit, NULL);
+        const char *p = get_cached_commit_buffer(the_repository, commit, NULL);
         const char *t;
 
         ret = xcalloc(1, sizeof(struct commitinfo));
diff --git a/shared.c b/shared.c
index 609bd2a..7560f5f 100644
--- a/shared.c
+++ b/shared.c
@@ -161,7 +161,7 @@ static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_
 
         ref = xmalloc(sizeof (struct refinfo));
         ref->refname = xstrdup(refname);
-        ref->object = parse_object(oid);
+        ref->object = parse_object(the_repository, oid);
         switch (ref->object->type) {
         case OBJ_TAG:
                 ref->tag = cgit_parse_tag((struct tag *)ref->object);
diff --git a/ui-blame.c b/ui-blame.c
index 50d0580..6dc555f 100644
--- a/ui-blame.c
+++ b/ui-blame.c
@@ -278,7 +278,7 @@ void cgit_print_blame(void)
                         "Invalid revision name: %s", rev);
                 return;
         }
-        commit = lookup_commit_reference(&oid);
+        commit = lookup_commit_reference(the_repository, &oid);
         if (!commit || parse_commit(commit)) {
                 cgit_print_error_page(404, "Not found",
                         "Invalid commit reference: %s", rev);
diff --git a/ui-blob.c b/ui-blob.c
index 7b6da2a..4b6b462 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -56,7 +56,7 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only)
                 goto done;
         if (oid_object_info(the_repository, &oid, &size) != OBJ_COMMIT)
                 goto done;
-        read_tree_recursive(lookup_commit_reference(&oid)->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+        read_tree_recursive(lookup_commit_reference(the_repository, &oid)->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
 
 done:
         free(path_items.match);
@@ -89,7 +89,7 @@ int cgit_print_file(char *path, const char *head, int file_only)
                 return -1;
         type = oid_object_info(the_repository, &oid, &size);
         if (type == OBJ_COMMIT) {
-                commit = lookup_commit_reference(&oid);
+                commit = lookup_commit_reference(the_repository, &oid);
                 read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
                 if (!walk_tree_ctx.found_path)
                         return -1;
@@ -145,7 +145,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl
         type = oid_object_info(the_repository, &oid, &size);
 
         if ((!hex) && type == OBJ_COMMIT && path) {
-                commit = lookup_commit_reference(&oid);
+                commit = lookup_commit_reference(the_repository, &oid);
                 read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
                 type = oid_object_info(the_repository, &oid, &size);
         }
diff --git a/ui-clone.c b/ui-clone.c
index 6ba8f36..5dccb63 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -19,12 +19,12 @@ static int print_ref_info(const char *refname, const struct object_id *oid,
 {
         struct object *obj;
 
-        if (!(obj = parse_object(oid)))
+        if (!(obj = parse_object(the_repository, oid)))
                 return 0;
 
         htmlf("%s\t%s\n", oid_to_hex(oid), refname);
         if (obj->type == OBJ_TAG) {
-                if (!(obj = deref_tag(obj, refname, 0)))
+                if (!(obj = deref_tag(the_repository, obj, refname, 0)))
                         return 0;
                 htmlf("%s\t%s^{}\n", oid_to_hex(&obj->oid), refname);
         }
diff --git a/ui-commit.c b/ui-commit.c
index 995cb93..9a47b54 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -31,7 +31,7 @@ void cgit_print_commit(char *hex, const char *prefix)
                                 "Bad object id: %s", hex);
                 return;
         }
-        commit = lookup_commit_reference(&oid);
+        commit = lookup_commit_reference(the_repository, &oid);
         if (!commit) {
                 cgit_print_error_page(404, "Not found",
                                 "Bad commit reference: %s", hex);
@@ -87,7 +87,7 @@ void cgit_print_commit(char *hex, const char *prefix)
         free(tmp);
         html("</td></tr>\n");
         for (p = commit->parents; p; p = p->next) {
-                parent = lookup_commit_reference(&p->item->object.oid);
+                parent = lookup_commit_reference(the_repository, &p->item->object.oid);
                 if (!parent) {
                         html("<tr><td colspan='3'>");
                         cgit_print_error("Error reading parent commit");
diff --git a/ui-diff.c b/ui-diff.c
index e33e9fb..70dcc91 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -407,7 +407,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
                         "Bad object name: %s", new_rev);
                 return;
         }
-        commit = lookup_commit_reference(new_rev_oid);
+        commit = lookup_commit_reference(the_repository, new_rev_oid);
         if (!commit || parse_commit(commit)) {
                 cgit_print_error_page(404, "Not found",
                         "Bad commit: %s", oid_to_hex(new_rev_oid));
@@ -428,7 +428,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
         }
 
         if (!is_null_oid(old_rev_oid)) {
-                commit2 = lookup_commit_reference(old_rev_oid);
+                commit2 = lookup_commit_reference(the_repository, old_rev_oid);
                 if (!commit2 || parse_commit(commit2)) {
                         cgit_print_error_page(404, "Not found",
                                 "Bad commit: %s", oid_to_hex(old_rev_oid));
diff --git a/ui-patch.c b/ui-patch.c
index 82f125b..5a96410 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -36,7 +36,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
                                 "Bad object id: %s", new_rev);
                 return;
         }
-        commit = lookup_commit_reference(&new_rev_oid);
+        commit = lookup_commit_reference(the_repository, &new_rev_oid);
         if (!commit) {
                 cgit_print_error_page(404, "Not found",
                                 "Bad commit reference: %s", new_rev);
@@ -49,7 +49,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
                                         "Bad object id: %s", old_rev);
                         return;
                 }
-                if (!lookup_commit_reference(&old_rev_oid)) {
+                if (!lookup_commit_reference(the_repository, &old_rev_oid)) {
                         cgit_print_error_page(404, "Not found",
                                         "Bad commit reference: %s", old_rev);
                         return;
diff --git a/ui-plain.c b/ui-plain.c
index ddb3e48..070c34b 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -185,7 +185,7 @@ void cgit_print_plain(void)
                 cgit_print_error_page(404, "Not found", "Not found");
                 return;
         }
-        commit = lookup_commit_reference(&oid);
+        commit = lookup_commit_reference(the_repository, &oid);
         if (!commit || parse_commit(commit)) {
                 cgit_print_error_page(404, "Not found", "Not found");
                 return;
diff --git a/ui-snapshot.c b/ui-snapshot.c
index fa3ceaf..85efe64 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -37,7 +37,7 @@ static int write_archive_type(const char *format, const char *hex, const char *p
         /* argv_array guarantees a trailing NULL entry. */
         memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
 
-        result = write_archive(argv.argc, nargv, NULL, NULL, 0);
+        result = write_archive(argv.argc, nargv, NULL, the_repository, NULL, 0);
         argv_array_clear(&argv);
         free(nargv);
         return result;
@@ -147,7 +147,7 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
                                 "Bad object id: %s", hex);
                 return 1;
         }
-        if (!lookup_commit_reference(&oid)) {
+        if (!lookup_commit_reference(the_repository, &oid)) {
                 cgit_print_error_page(400, "Bad request",
                                 "Not a commit reference: %s", hex);
                 return 1;
diff --git a/ui-tag.c b/ui-tag.c
index 2c96c37..f530224 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -53,7 +53,7 @@ void cgit_print_tag(char *revname)
                         "Bad tag reference: %s", revname);
                 goto cleanup;
         }
-        obj = parse_object(&oid);
+        obj = parse_object(the_repository, &oid);
         if (!obj) {
                 cgit_print_error_page(500, "Internal server error",
                         "Bad object id: %s", oid_to_hex(&oid));
@@ -63,7 +63,7 @@ void cgit_print_tag(char *revname)
                 struct tag *tag;
                 struct taginfo *info;
 
-                tag = lookup_tag(&oid);
+                tag = lookup_tag(the_repository, &oid);
                 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) {
                         cgit_print_error_page(500, "Internal server error",
                                 "Bad tag object: %s", revname);
diff --git a/ui-tree.c b/ui-tree.c
index e6b3074..df8ad82 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -177,7 +177,7 @@ static void write_tree_link(const struct object_id *oid, char *name,
                 cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, rev,
                                fullpath->buf);
 
-                tree = lookup_tree(&tree_ctx.oid);
+                tree = lookup_tree(the_repository, &tree_ctx.oid);
                 if (!tree)
                         return;
 
@@ -359,7 +359,7 @@ void cgit_print_tree(const char *rev, char *path)
                         "Invalid revision name: %s", rev);
                 return;
         }
-        commit = lookup_commit_reference(&oid);
+        commit = lookup_commit_reference(the_repository, &oid);
         if (!commit || parse_commit(commit)) {
                 cgit_print_error_page(404, "Not found",
                         "Invalid commit reference: %s", rev);