diff --git a/Makefile b/Makefile
index cf43c9a..9cead7b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
all::
-CGIT_VERSION = 1.4.1
+CGIT_VERSION = 1.5.1
CGIT_SCRIPT_NAME = cgit.cgi
CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
diff --git a/cgit.c b/cgit.c
index 3e76a0a..ca0c77e 100644
--- a/cgit.c
+++ b/cgit.c
@@ -448,7 +448,7 @@ struct refmatch {
int match;
};
-static int find_current_ref(const char *refname, const struct object_id *oid,
+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 dafc8c4..bc0bbf9 100644
--- a/cgit.h
+++ b/cgit.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/default.nix b/default.nix
index fed5a34..0f15596 100644
--- a/default.nix
+++ b/default.nix
@@ -7,20 +7,19 @@
callPackage (import (pkgs.path + "/pkgs/applications/version-management/cgit/common.nix") rec {
pname = "cgit-magenta";
- version = "1.4.1";
+ version = "1.5.1";
src = ./.;
# cgit-pink is tightly coupled with git and needs a git source tree to build.
# IMPORTANT: Remember to check which git version cgit-pink needs on every
# version bump (look for "GIT_VER" in the top-level Makefile).
gitSrc = fetchurl {
- url = "mirror://kernel/software/scm/git/git-2.36.1.tar.xz";
- sha256 = "0w43a35mhc2qf2gjkxjlnkf2lq8g0snf34iy5gqx2678yq7llpa0";
+ url = "mirror://kernel/software/scm/git/git-2.48.1.tar.xz";
+ sha256 = "HF1UX13B61HpXSxQ2Y/fiLGja6H6MOmuXVOFxgJPgq0=";
};
homepage = "https://cgit.rory.gay/cgit-magenta.git/about/";
description = "cgit fork aiming for better maintenance (again)";
- #maintainers = with lib.maintainers; [ sternenseemann ];
maintainers = [];
}) { }
diff --git a/git b/git
-Subproject 39bf06adf96da25b87c9aa7d35a32ef3683eb4a
+Subproject f93ff170b93a1782659637824b25923245ac9dd
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..282d1e1 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -16,7 +16,7 @@
#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;
diff --git a/ui-shared.c b/ui-shared.c
index 9927c9b..22b91ad 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -945,7 +945,7 @@ static int print_this_commit_option(void)
return 0;
}
-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;
|
