]> git.ipfire.org Git - thirdparty/git.git/commitdiff
midx-write: use `revs->repo` inside `read_refs_snapshot`
authorKarthik Nayak <karthik.188@gmail.com>
Wed, 27 Nov 2024 16:28:27 +0000 (17:28 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Dec 2024 01:32:20 +0000 (10:32 +0900)
The function `read_refs_snapshot()` uses `parse_oid_hex()`, which relies
on the global `the_hash_algo` variable. Let's instead use
`parse_oid_hex_algop()` and provide the hash algo via `revs->repo`.

Also, while here, fix a missing newline after the function's definition.

Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
midx-write.c

index 22b5233f51ec6c6d99b8f9613818f1581dca5982..564438f616f59cd24edda956e4af0e0acf167138 100644 (file)
@@ -760,7 +760,7 @@ static int read_refs_snapshot(const char *refs_snapshot,
                        hex = &buf.buf[1];
                }
 
-               if (parse_oid_hex(hex, &oid, &end) < 0)
+               if (parse_oid_hex_algop(hex, &oid, &end, revs->repo->hash_algo) < 0)
                        die(_("could not parse line: %s"), buf.buf);
                if (*end)
                        die(_("malformed line: %s"), buf.buf);
@@ -776,6 +776,7 @@ static int read_refs_snapshot(const char *refs_snapshot,
        strbuf_release(&buf);
        return 0;
 }
+
 static struct commit **find_commits_for_midx_bitmap(uint32_t *indexed_commits_nr_p,
                                                    const char *refs_snapshot,
                                                    struct write_midx_context *ctx)