aboutsummaryrefslogtreecommitdiffstats
path: root/ui-log.c
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2024-07-16 09:45:13 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2024-08-02 18:22:56 +0200
commit09d24d7cd0b7e85633f2f43808b12871bb209d69 (patch)
tree221e441f0d95d0f59c16ea81401a705a2777d98c /ui-log.c
parentfb87de795b9f1b1e21825243716ff1156097adf2 (diff)
downloadcgit-09d24d7cd0b7e85633f2f43808b12871bb209d69.tar.gz
cgit-09d24d7cd0b7e85633f2f43808b12871bb209d69.tar.xz
git: update to v2.46.0origin/master
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>
Diffstat (limited to 'ui-log.c')
-rw-r--r--ui-log.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui-log.c b/ui-log.c
index 50d479d..ee2a607 100644
--- a/ui-log.c
+++ b/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;