git: update to v2.46.0

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index e61629237cac22d9de48cf3316873cd7d0f586d4..2efa96235a5ffb2552209800e5d40392ca05a1c3 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -6,6 +6,8 @@
  *   (see COPYING for full license text)
  */
 
  *   (see COPYING for full license text)
  */
 

+#define USE_THE_REPOSITORY_VARIABLE
+

 #include "cgit.h"
 #include "cache.h"
 #include "cmd.h"
 #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;
        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
        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;
 
        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);
        if (!ref || !skip_prefix(ref, "refs/heads/", &refname))
                return "master";
        return xstrdup(refname);