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>
Karthik Nayak committed
Dec 3, 2024 at 15:43 UTC
873b00597bbf20c1bcda089a687641167b148fa2
6 files changed
+14
-14
builtin/fast-import.c
+4
-4
@@ -806,7 +806,7 @@ static char *keep_pack(const char *curr_index_name)
806
struct strbuf name = STRBUF_INIT;
807
int keep_fd;
808
809
- odb_pack_name(&name, pack_data->hash, "keep");
809
+ odb_pack_name(pack_data->repo, &name, pack_data->hash, "keep");
810
keep_fd = odb_pack_keep(name.buf);
811
if (keep_fd < 0)
812
die_errno("cannot create keep file");
@@ -814,11 +814,11 @@ static char *keep_pack(const char *curr_index_name)
814
if (close(keep_fd))
815
die_errno("failed to write keep file");
816
817
- odb_pack_name(&name, pack_data->hash, "pack");
817
+ odb_pack_name(pack_data->repo, &name, pack_data->hash, "pack");
818
if (finalize_object_file(pack_data->pack_name, name.buf))
819
die("cannot store pack file");
820
821
- odb_pack_name(&name, pack_data->hash, "idx");
821
+ odb_pack_name(pack_data->repo, &name, pack_data->hash, "idx");
822
if (finalize_object_file(curr_index_name, name.buf))
823
die("cannot store index file");
824
free((void *)curr_index_name);
@@ -832,7 +832,7 @@ static void unkeep_all_packs(void)
832
833
for (k = 0; k < pack_id; k++) {
834
struct packed_git *p = all_packs[k];
835
- odb_pack_name(&name, p->hash, "keep");
835
+ odb_pack_name(p->repo, &name, p->hash, "keep");
836
unlink_or_warn(name.buf);
837
}
838
strbuf_release(&name);
builtin/index-pack.c
+2
-2
@@ -1479,7 +1479,7 @@ static void write_special_file(const char *suffix, const char *msg,
1479
if (pack_name)
1480
filename = derive_filename(pack_name, "pack", suffix, &name_buf);
1481
else
1482
- filename = odb_pack_name(&name_buf, hash, suffix);
1482
+ filename = odb_pack_name(the_repository, &name_buf, hash, suffix);
1483
1484
fd = odb_pack_keep(filename);
1485
if (fd < 0) {
@@ -1507,7 +1507,7 @@ static void rename_tmp_packfile(const char **final_name,
1507
{
1508
if (!*final_name || strcmp(*final_name, curr_name)) {
1509
if (!*final_name)
1510
- *final_name = odb_pack_name(name, hash, ext);
1510
+ *final_name = odb_pack_name(the_repository, name, hash, ext);
1511
if (finalize_object_file(curr_name, *final_name))
1512
die(_("unable to rename temporary '*.%s' file to '%s'"),
1513
ext, *final_name);
builtin/pack-redundant.c
+1
-1
@@ -690,7 +690,7 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix UNUSED, s
690
pl = red = pack_list_difference(local_packs, min);
691
while (pl) {
692
printf("%s\n%s\n",
693
- odb_pack_name(&idx_name, pl->pack->hash, "idx"),
693
+ odb_pack_name(pl->pack->repo, &idx_name, pl->pack->hash, "idx"),
694
pl->pack->pack_name);
695
pl = pl->next;
696
}
http.c
+1
-1
@@ -2581,7 +2581,7 @@ struct http_pack_request *new_direct_http_pack_request(
2581
2582
preq->url = url;
2583
2584
- odb_pack_name(&preq->tmpfile, packed_git_hash, "pack");
2584
+ odb_pack_name(the_repository, &preq->tmpfile, packed_git_hash, "pack");
2585
strbuf_addstr(&preq->tmpfile, ".temp");
2586
preq->packfile = fopen(preq->tmpfile.buf, "a");
2587
if (!preq->packfile) {
packfile.c
+4
-5
@@ -25,13 +25,12 @@
25
#include "pack-revindex.h"
26
#include "promisor-remote.h"
27
28
-char *odb_pack_name(struct strbuf *buf,
29
- const unsigned char *hash,
30
- const char *ext)
28
+char *odb_pack_name(struct repository *r, struct strbuf *buf,
29
+ const unsigned char *hash, const char *ext)
30
{
31
strbuf_reset(buf);
33
- strbuf_addf(buf, "%s/pack/pack-%s.%s", repo_get_object_directory(the_repository),
34
- hash_to_hex(hash), ext);
32
+ strbuf_addf(buf, "%s/pack/pack-%s.%s", repo_get_object_directory(r),
33
+ hash_to_hex_algop(hash, r->hash_algo), ext);
34
return buf->buf;
35
}
36
packfile.h
+2
-1
@@ -29,7 +29,8 @@ struct pack_entry {
29
*
30
* Example: odb_pack_name(out, sha1, "idx") => ".git/objects/pack/pack-1234..idx"
31
*/
32
-char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext);
32
+char *odb_pack_name(struct repository *r, struct strbuf *buf,
33
+ const unsigned char *hash, const char *ext);
34
35
/*
36
* Return the basename of the packfile, omitting any containing directory