git: update to v2.46.0

[ps-cgit] / parsing.c

diff --git a/parsing.c b/parsing.c
index e647dba018fd470578f570750ce70196c8d7682d..5616d4331ebb89c20f940c4f2c1e8f00758c3b0b 100644 (file)
--- a/parsing.c
+++ b/parsing.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 "cgit.h"
 
 /*


@@ -127,7 +129,6 @@ static int end_of_header(const char *p)
 
 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
 
 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {

-       const int oid_hex_len = 40;

        struct commitinfo *ret;
        const char *p = repo_get_commit_buffer(the_repository, commit, NULL);
        const char *t;
        struct commitinfo *ret;
        const char *p = repo_get_commit_buffer(the_repository, commit, NULL);
        const char *t;


@@ -140,10 +141,10 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 
        if (!skip_prefix(p, "tree ", &p))
                die("Bad commit: %s", oid_to_hex(&commit->object.oid));
 
        if (!skip_prefix(p, "tree ", &p))
                die("Bad commit: %s", oid_to_hex(&commit->object.oid));

-       p += oid_hex_len + 1;
+       p += the_hash_algo->hexsz + 1;

 
        while (skip_prefix(p, "parent ", &p))
 
        while (skip_prefix(p, "parent ", &p))

-               p += oid_hex_len + 1;
+               p += the_hash_algo->hexsz + 1;

 
        if (p && skip_prefix(p, "author ", &p)) {
                parse_user(p, &ret->author, &ret->author_email,
 
        if (p && skip_prefix(p, "author ", &p)) {
                parse_user(p, &ret->author, &ret->author_email,


@@ -199,7 +200,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
        const char *p;
        struct taginfo *ret = NULL;
 
        const char *p;
        struct taginfo *ret = NULL;
 

-       data = read_object_file(&tag->object.oid, &type, &size);
+       data = repo_read_object_file(the_repository, &tag->object.oid, &type, &size);

        if (!data || type != OBJ_TAG)
                goto cleanup;
 
        if (!data || type != OBJ_TAG)
                goto cleanup;