mirror of
https://git.zx2c4.com/cgit
synced 2024-11-08 09:38:41 +00:00
git: update to v2.46.0
Update to git version v2.46.0, this requires changes for these upstream commits: * e7da9385708accf518a80a1e17969020fb361048 global: introduce `USE_THE_REPOSITORY_VARIABLE` macro * 9da95bda74cf10e1475384a71fd20914c3b99784 hash: require hash algorithm in `oidread()` and `oidclr()` * 30aaff437fddd889ba429b50b96ea4c151c502c5 refs: pass repo when peeling objects * c8f815c2083c4b340d4148a15d45c55f2fcc7d3f refs: remove functions without ref store Signed-off-by: Christian Hesse <mail@eworm.de>
This commit is contained in:
parent
fb87de795b
commit
09d24d7cd0
2
Makefile
2
Makefile
@ -14,7 +14,7 @@ htmldir = $(docdir)
|
||||
pdfdir = $(docdir)
|
||||
mandir = $(prefix)/share/man
|
||||
SHA1_HEADER = <openssl/sha.h>
|
||||
GIT_VER = 2.45.2
|
||||
GIT_VER = 2.46.0
|
||||
GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
|
||||
INSTALL = install
|
||||
COPYTREE = cp -r
|
||||
|
8
cgit.c
8
cgit.c
@ -6,6 +6,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
#include "cache.h"
|
||||
#include "cmd.h"
|
||||
@ -473,7 +475,8 @@ static char *find_default_branch(struct cgit_repo *repo)
|
||||
info.req_ref = repo->defbranch;
|
||||
info.first_ref = NULL;
|
||||
info.match = 0;
|
||||
for_each_branch_ref(find_current_ref, &info);
|
||||
refs_for_each_branch_ref(get_main_ref_store(the_repository),
|
||||
find_current_ref, &info);
|
||||
if (info.match)
|
||||
ref = info.req_ref;
|
||||
else
|
||||
@ -490,7 +493,8 @@ static char *guess_defbranch(void)
|
||||
const char *ref, *refname;
|
||||
struct object_id oid;
|
||||
|
||||
ref = resolve_ref_unsafe("HEAD", 0, &oid, NULL);
|
||||
ref = refs_resolve_ref_unsafe(get_main_ref_store(the_repository),
|
||||
"HEAD", 0, &oid, NULL);
|
||||
if (!ref || !skip_prefix(ref, "refs/heads/", &refname))
|
||||
return "master";
|
||||
return xstrdup(refname);
|
||||
|
2
git
2
git
@ -1 +1 @@
|
||||
Subproject commit bea9ecd24b0c3bf06cab4a851694fe09e7e51408
|
||||
Subproject commit 39bf06adf96da25b87c9aa7d35a32ef3683eb4a4
|
@ -6,6 +6,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
|
||||
/*
|
||||
|
2
shared.c
2
shared.c
@ -6,6 +6,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
|
||||
struct cgit_repolist cgit_repolist;
|
||||
|
@ -6,6 +6,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
#include "ui-atom.h"
|
||||
#include "html.h"
|
||||
|
@ -6,6 +6,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
#include "ui-blame.h"
|
||||
#include "html.h"
|
||||
|
@ -6,6 +6,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
#include "ui-blob.h"
|
||||
#include "html.h"
|
||||
|
@ -7,6 +7,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
#include "ui-clone.h"
|
||||
#include "html.h"
|
||||
@ -87,7 +89,8 @@ void cgit_clone_info(void)
|
||||
ctx.page.mimetype = "text/plain";
|
||||
ctx.page.filename = "info/refs";
|
||||
cgit_print_http_headers();
|
||||
for_each_ref(print_ref_info, NULL);
|
||||
refs_for_each_ref(get_main_ref_store(the_repository),
|
||||
print_ref_info, NULL);
|
||||
}
|
||||
|
||||
void cgit_clone_objects(void)
|
||||
|
@ -6,6 +6,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
#include "ui-commit.h"
|
||||
#include "html.h"
|
||||
|
@ -6,6 +6,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
#include "ui-diff.h"
|
||||
#include "html.h"
|
||||
@ -424,7 +426,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
|
||||
} else if (commit->parents && commit->parents->item) {
|
||||
oidcpy(old_rev_oid, &commit->parents->item->object.oid);
|
||||
} else {
|
||||
oidclr(old_rev_oid);
|
||||
oidclr(old_rev_oid, the_repository->hash_algo);
|
||||
}
|
||||
|
||||
if (!is_null_oid(old_rev_oid)) {
|
||||
|
5
ui-log.c
5
ui-log.c
@ -6,6 +6,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
#include "ui-log.h"
|
||||
#include "html.h"
|
||||
@ -80,7 +82,8 @@ void show_commit_decorations(struct commit *commit)
|
||||
ctx.qry.showmsg, 0);
|
||||
break;
|
||||
case DECORATION_REF_TAG:
|
||||
if (!read_ref(deco->name, &oid_tag) && !peel_iterated_oid(&oid_tag, &peeled))
|
||||
if (!refs_read_ref(get_main_ref_store(the_repository), deco->name, &oid_tag) &&
|
||||
!peel_iterated_oid(the_repository, &oid_tag, &peeled))
|
||||
is_annotated = !oideq(&oid_tag, &peeled);
|
||||
cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf);
|
||||
break;
|
||||
|
@ -6,6 +6,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
#include "ui-patch.h"
|
||||
#include "html.h"
|
||||
@ -57,7 +59,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
|
||||
} else if (commit->parents && commit->parents->item) {
|
||||
oidcpy(&old_rev_oid, &commit->parents->item->object.oid);
|
||||
} else {
|
||||
oidclr(&old_rev_oid);
|
||||
oidclr(&old_rev_oid, the_repository->hash_algo);
|
||||
}
|
||||
|
||||
if (is_null_oid(&old_rev_oid)) {
|
||||
|
@ -6,6 +6,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
#include "ui-plain.h"
|
||||
#include "html.h"
|
||||
|
11
ui-refs.c
11
ui-refs.c
@ -6,6 +6,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
#include "ui-refs.h"
|
||||
#include "html.h"
|
||||
@ -155,9 +157,11 @@ void cgit_print_branches(int maxcount)
|
||||
|
||||
list.refs = NULL;
|
||||
list.alloc = list.count = 0;
|
||||
for_each_branch_ref(cgit_refs_cb, &list);
|
||||
refs_for_each_branch_ref(get_main_ref_store(the_repository),
|
||||
cgit_refs_cb, &list);
|
||||
if (ctx.repo->enable_remote_branches)
|
||||
for_each_remote_ref(cgit_refs_cb, &list);
|
||||
refs_for_each_remote_ref(get_main_ref_store(the_repository),
|
||||
cgit_refs_cb, &list);
|
||||
|
||||
if (maxcount == 0 || maxcount > list.count)
|
||||
maxcount = list.count;
|
||||
@ -182,7 +186,8 @@ void cgit_print_tags(int maxcount)
|
||||
|
||||
list.refs = NULL;
|
||||
list.alloc = list.count = 0;
|
||||
for_each_tag_ref(cgit_refs_cb, &list);
|
||||
refs_for_each_tag_ref(get_main_ref_store(the_repository),
|
||||
cgit_refs_cb, &list);
|
||||
if (list.count == 0)
|
||||
return;
|
||||
qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age);
|
||||
|
@ -6,6 +6,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
#include "ui-shared.h"
|
||||
#include "cmd.h"
|
||||
@ -1041,9 +1043,11 @@ static void print_header(void)
|
||||
html("<form method='get'>\n");
|
||||
cgit_add_hidden_formfields(0, 1, ctx.qry.page);
|
||||
html("<select name='h' onchange='this.form.submit();'>\n");
|
||||
for_each_branch_ref(print_branch_option, ctx.qry.head);
|
||||
refs_for_each_branch_ref(get_main_ref_store(the_repository),
|
||||
print_branch_option, ctx.qry.head);
|
||||
if (ctx.repo->enable_remote_branches)
|
||||
for_each_remote_ref(print_branch_option, ctx.qry.head);
|
||||
refs_for_each_remote_ref(get_main_ref_store(the_repository),
|
||||
print_branch_option, ctx.qry.head);
|
||||
html("</select> ");
|
||||
html("<input type='submit' value='switch'/>");
|
||||
html("</form>");
|
||||
|
@ -6,6 +6,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
#include "ui-snapshot.h"
|
||||
#include "html.h"
|
||||
|
@ -6,6 +6,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
#include "ui-stats.h"
|
||||
#include "html.h"
|
||||
|
2
ui-tag.c
2
ui-tag.c
@ -6,6 +6,8 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
|
||||
#include "cgit.h"
|
||||
#include "ui-tag.h"
|
||||
#include "html.h"
|
||||
|
Loading…
Reference in New Issue
Block a user