mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 16:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

git: update to v2.47.0

Browse Source 
Update to git version v2.47.0, this requires changes for these
upstream commits:

* e8207717f1623325fe1c95338fb03c1104ed5687
  refs: add referent to each_ref_fn

Signed-off-by: Christian Hesse <mail@eworm.de>
This commit is contained in:
Christian Hesse 2024-09-26 19:41:29 +02:00
parent 1cb701a9b6
commit c1733e28d9
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -14,7 +14,7 @@ htmldir = $(docdir)
pdfdir = $(docdir) pdfdir = $(docdir)
mandir = $(prefix)/share/man mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h> SHA1_HEADER = <openssl/sha.h>
GIT_VER = 2.46.2 GIT_VER = 2.47.0
GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
INSTALL = install INSTALL = install
COPYTREE = cp -r COPYTREE = cp -r

4
cgit.c
View File

@ -448,8 +448,8 @@ struct refmatch {
int match; 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 UNUSED,
int flags, void *cb_data) const struct object_id *oid, int flags, void *cb_data)
{ {
struct refmatch *info; struct refmatch *info;

4
cgit.h
View File

@ -346,8 +346,8 @@ extern void strbuf_ensure_end(struct strbuf *sb, char c);
extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
extern void cgit_free_reflist_inner(struct reflist *list); 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 UNUSED,
int flags, void *cb_data); const struct object_id *oid, int flags, void *cb_data);
extern void cgit_free_commitinfo(struct commitinfo *info); extern void cgit_free_commitinfo(struct commitinfo *info);
extern void cgit_free_taginfo(struct taginfo *info); extern void cgit_free_taginfo(struct taginfo *info);

2
git

@ -1 +1 @@
Subproject commit 4f71522dfb7fc53eff569023303980c66114b1bc Subproject commit 777489f9e09c8d0dd6b12f9d90de6376330577a2

4
shared.c
View File

@ -212,8 +212,8 @@ void cgit_free_reflist_inner(struct reflist *list)
free(list->refs); 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 UNUSED,
void *cb_data) const struct object_id *oid, int flags, void *cb_data)
{ {
struct reflist *list = (struct reflist *)cb_data; struct reflist *list = (struct reflist *)cb_data;
struct refinfo *info = cgit_mk_refinfo(refname, oid); struct refinfo *info = cgit_mk_refinfo(refname, oid);

4
ui-clone.c
View File

@ -16,8 +16,8 @@
#include "packfile.h" #include "packfile.h"
#include "object-store.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 UNUSED,
int flags, void *cb_data) const struct object_id *oid, int flags, void *cb_data)
{ {
struct object *obj; struct object *obj;

4
ui-shared.c
View File

@ -936,8 +936,8 @@ void cgit_add_clone_urls(void (*fn)(const char *))
add_clone_urls(fn, ctx.cfg.clone_prefix, ctx.repo->url); 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 UNUSED,
int flags, void *cb_data) const struct object_id *oid, int flags, void *cb_data)
{ {
char *name = (char *)refname; char *name = (char *)refname;
html_option(name, name, ctx.qry.head); html_option(name, name, ctx.qry.head);