packfile: pass down repository to `odb_pack_name`

The function `odb_pack_name` currently relies on the global variable
`the_repository`. To eliminate global variable usage in `packfile.c`, we
should progressively shift the dependency on the_repository to higher
layers.

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

diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index da7e2d613b7e7707af9bf6f6666376afe23165b6..3ccc4c572272a9a2b7c1199bd0d99e05fbde97c5 100644 (file)
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -806,7 +806,7 @@ static char *keep_pack(const char *curr_index_name)
        struct strbuf name = STRBUF_INIT;
        int keep_fd;
 
-       odb_pack_name(&name, pack_data->hash, "keep");
+       odb_pack_name(pack_data->repo, &name, pack_data->hash, "keep");
        keep_fd = odb_pack_keep(name.buf);
        if (keep_fd < 0)
                die_errno("cannot create keep file");
@@ -814,11 +814,11 @@ static char *keep_pack(const char *curr_index_name)
        if (close(keep_fd))
                die_errno("failed to write keep file");
 
-       odb_pack_name(&name, pack_data->hash, "pack");
+       odb_pack_name(pack_data->repo, &name, pack_data->hash, "pack");
        if (finalize_object_file(pack_data->pack_name, name.buf))
                die("cannot store pack file");
 
-       odb_pack_name(&name, pack_data->hash, "idx");
+       odb_pack_name(pack_data->repo, &name, pack_data->hash, "idx");
        if (finalize_object_file(curr_index_name, name.buf))
                die("cannot store index file");
        free((void *)curr_index_name);
@@ -832,7 +832,7 @@ static void unkeep_all_packs(void)
 
        for (k = 0; k < pack_id; k++) {
                struct packed_git *p = all_packs[k];
-               odb_pack_name(&name, p->hash, "keep");
+               odb_pack_name(p->repo, &name, p->hash, "keep");
                unlink_or_warn(name.buf);
        }
        strbuf_release(&name);

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index be2f99625ea3c7086f63342c49395a0c2720499b..eaefb41761e20ee353e392a9fd4dbf678e42a626 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1479,7 +1479,7 @@ static void write_special_file(const char *suffix, const char *msg,
        if (pack_name)
                filename = derive_filename(pack_name, "pack", suffix, &name_buf);
        else
-               filename = odb_pack_name(&name_buf, hash, suffix);
+               filename = odb_pack_name(the_repository, &name_buf, hash, suffix);
 
        fd = odb_pack_keep(filename);
        if (fd < 0) {
@@ -1507,7 +1507,7 @@ static void rename_tmp_packfile(const char **final_name,
 {
        if (!*final_name || strcmp(*final_name, curr_name)) {
                if (!*final_name)
-                       *final_name = odb_pack_name(name, hash, ext);
+                       *final_name = odb_pack_name(the_repository, name, hash, ext);
                if (finalize_object_file(curr_name, *final_name))
                        die(_("unable to rename temporary '*.%s' file to '%s'"),
                            ext, *final_name);

diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index d2c1c4e5ec14711a54b8483106e9ed05fbe960bf..bc61990a933680c8674bfbf2106f18b8046e8ed5 100644 (file)
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -690,7 +690,7 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix UNUSED, s
        pl = red = pack_list_difference(local_packs, min);
        while (pl) {
                printf("%s\n%s\n",
-                      odb_pack_name(&idx_name, pl->pack->hash, "idx"),
+                      odb_pack_name(pl->pack->repo, &idx_name, pl->pack->hash, "idx"),
                       pl->pack->pack_name);
                pl = pl->next;
        }

diff --git a/http.c b/http.c
index 6744e184092cf645ba863cec4b1675090bd1473e..420f1566f009ec3e1e8fb7fd8318df8912453a40 100644 (file)
--- a/http.c
+++ b/http.c
@@ -2581,7 +2581,7 @@ struct http_pack_request *new_direct_http_pack_request(
 
        preq->url = url;
 
-       odb_pack_name(&preq->tmpfile, packed_git_hash, "pack");
+       odb_pack_name(the_repository, &preq->tmpfile, packed_git_hash, "pack");
        strbuf_addstr(&preq->tmpfile, ".temp");
        preq->packfile = fopen(preq->tmpfile.buf, "a");
        if (!preq->packfile) {

diff --git a/packfile.c b/packfile.c
index c96ebc4c694146b841b63f90654be81433873fd1..1015dac6dbcef326ea65bf7a971b2793d325c30b 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -25,13 +25,12 @@
 #include "pack-revindex.h"
 #include "promisor-remote.h"
 
-char *odb_pack_name(struct strbuf *buf,
-                   const unsigned char *hash,
-                   const char *ext)
+char *odb_pack_name(struct repository *r, struct strbuf *buf,
+                   const unsigned char *hash, const char *ext)
 {
        strbuf_reset(buf);
-       strbuf_addf(buf, "%s/pack/pack-%s.%s", repo_get_object_directory(the_repository),
-                   hash_to_hex(hash), ext);
+       strbuf_addf(buf, "%s/pack/pack-%s.%s", repo_get_object_directory(r),
+                   hash_to_hex_algop(hash, r->hash_algo), ext);
        return buf->buf;
 }
 

diff --git a/packfile.h b/packfile.h
index aee69d1a0b63445ccabda91cba4fe3967ed98673..51187f2393f35300ca0ff7d334b22206618bdb56 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -29,7 +29,8 @@ struct pack_entry {
  *
  * Example: odb_pack_name(out, sha1, "idx") => ".git/objects/pack/pack-1234..idx"
  */
-char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext);
+char *odb_pack_name(struct repository *r, struct strbuf *buf,
+                   const unsigned char *hash, const char *ext);
 
 /*
  * Return the basename of the packfile, omitting any containing directory