git: update to v2.51.0

7 files changed, 10 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 7f8a5cb..60075af 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.46.0
+GIT_VER = 2.51.0
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/cgit.c b/cgit.c
index 2efa962..d897e26 100644
--- a/cgit.c
+++ b/cgit.c
@@ -448,8 +448,8 @@ struct refmatch {
 	int match;
 };
 
-static int find_current_ref(const char *refname, const struct object_id *oid,
-			    int flags, void *cb_data)
+static int find_current_ref(const char *refname, const char *referent,
+		const struct object_id *oid, int flags, void *cb_data)
 {
 	struct refmatch *info;
 
diff --git a/cgit.h b/cgit.h
index e0d286d..40f64a0 100644
--- a/cgit.h
+++ b/cgit.h
@@ -17,7 +17,7 @@
 #include <notes.h>
 #include <object.h>
 #include <object-name.h>
-#include <object-store.h>
+#include <odb.h>
 #include <path.h>
 #include <refs.h>
 #include <revision.h>
@@ -346,7 +346,7 @@ extern void strbuf_ensure_end(struct strbuf *sb, char c);
 
 extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
 extern void cgit_free_reflist_inner(struct reflist *list);
-extern int cgit_refs_cb(const char *refname, const struct object_id *oid,
+extern int cgit_refs_cb(const char *refname, const char *referent, const struct object_id *oid,
 			int flags, void *cb_data);
 
 extern void cgit_free_commitinfo(struct commitinfo *info);
diff --git a/git b/git
-Subproject 39bf06adf96da25b87c9aa7d35a32ef3683eb4a
+Subproject c44beea485f0f2feaf460e2ac87fdd5608d63cf
diff --git a/shared.c b/shared.c
index ae3f6c1..36ee706 100644
--- a/shared.c
+++ b/shared.c
@@ -212,7 +212,7 @@ void cgit_free_reflist_inner(struct reflist *list)
 	free(list->refs);
 }
 
-int cgit_refs_cb(const char *refname, const struct object_id *oid, int flags,
+int cgit_refs_cb(const char *refname, const char *referent, const struct object_id *oid, int flags,
 		  void *cb_data)
 {
 	struct reflist *list = (struct reflist *)cb_data;
diff --git a/ui-clone.c b/ui-clone.c
index df196a0..97a6d63 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -14,9 +14,8 @@
 #include "html.h"
 #include "ui-shared.h"
 #include "packfile.h"
-#include "object-store.h"
 
-static int print_ref_info(const char *refname, const struct object_id *oid,
+static int print_ref_info(const char *refname, const char *referent, const struct object_id *oid,
                           int flags, void *cb_data)
 {
 	struct object *obj;
@@ -116,7 +115,7 @@ void cgit_clone_objects(void)
 			goto err;
 	}
 
-	send_file(git_path("objects/%s", ctx.qry.path));
+	send_file(repo_git_path(the_repository, "objects/%s", ctx.qry.path));
 	return;
 
 err:
@@ -125,5 +124,5 @@ err:
 
 void cgit_clone_head(void)
 {
-	send_file(git_path("%s", "HEAD"));
+	send_file(repo_git_path(the_repository, "%s", "HEAD"));
 }
diff --git a/ui-shared.c b/ui-shared.c
index da37b06..93ab93c 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -940,7 +940,7 @@ void cgit_add_clone_urls(void (*fn)(const char *))
 		add_clone_urls(fn, ctx.cfg.clone_prefix, ctx.repo->url);
 }
 
-static int print_branch_option(const char *refname, const struct object_id *oid,
+static int print_branch_option(const char *refname, const char *referent, const struct object_id *oid,
 			       int flags, void *cb_data)
 {
 	char *name = (char *)refname;