global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 10:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

pack-write: stop depending on the_repository and the_hash_algo

Browse Source 
There are a couple of functions in "pack-write.c" that implicitly depend
on `the_repository` or `the_hash_algo`. Remove this dependency by
injecting the repository via a parameter and adapt callers accordingly.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2025-03-10 08:13:22 +01:00
committed by Junio C Hamano
parent 74d414c9f1
commit 2582846f2f
7 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/fast-import.c
View File

@@ -798,7 +798,7 @@ static const char *create_index(void)
if (c != last) if (c != last)
die("internal consistency error creating the index"); die("internal consistency error creating the index");
tmpfile = write_idx_file(the_hash_algo, NULL, idx, object_count, tmpfile = write_idx_file(the_repository, NULL, idx, object_count,
&pack_idx_opts, pack_data->hash); &pack_idx_opts, pack_data->hash);
free(idx); free(idx);
return tmpfile; return tmpfile;

4
builtin/index-pack.c
View File

@@ -2088,10 +2088,10 @@ int cmd_index_pack(int argc,
ALLOC_ARRAY(idx_objects, nr_objects); ALLOC_ARRAY(idx_objects, nr_objects);
for (i = 0; i < nr_objects; i++) for (i = 0; i < nr_objects; i++)
idx_objects[i] = &objects[i].idx; idx_objects[i] = &objects[i].idx;
curr_index = write_idx_file(the_hash_algo, index_name, idx_objects, curr_index = write_idx_file(the_repository, index_name, idx_objects,
nr_objects, &opts, pack_hash); nr_objects, &opts, pack_hash);
if (rev_index) if (rev_index)
curr_rev_index = write_rev_file(the_hash_algo, rev_index_name, curr_rev_index = write_rev_file(the_repository, rev_index_name,
idx_objects, nr_objects, idx_objects, nr_objects,
pack_hash, opts.flags); pack_hash, opts.flags);
free(idx_objects); free(idx_objects);

4
builtin/pack-objects.c
View File

@@ -1314,7 +1314,7 @@ static void write_pack_file(void)
f = hashfd_throughput(the_repository->hash_algo, 1, f = hashfd_throughput(the_repository->hash_algo, 1,
"<stdout>", progress_state); "<stdout>", progress_state);
else else
f = create_tmp_packfile(&pack_tmp_name); f = create_tmp_packfile(the_repository, &pack_tmp_name);
offset = write_pack_header(f, nr_remaining); offset = write_pack_header(f, nr_remaining);
@@ -1407,7 +1407,7 @@ static void write_pack_file(void)
if (cruft) if (cruft)
pack_idx_opts.flags |= WRITE_MTIMES; pack_idx_opts.flags |= WRITE_MTIMES;
stage_tmp_packfiles(the_hash_algo, &tmpname, stage_tmp_packfiles(the_repository, &tmpname,
pack_tmp_name, written_list, pack_tmp_name, written_list,
nr_written, &to_pack, nr_written, &to_pack,
&pack_idx_opts, hash, &pack_idx_opts, hash,

4
bulk-checkin.c
View File

@@ -44,7 +44,7 @@ static void finish_tmp_packfile(struct strbuf *basename,
{ {
char *idx_tmp_name = NULL; char *idx_tmp_name = NULL;
stage_tmp_packfiles(the_hash_algo, basename, pack_tmp_name, stage_tmp_packfiles(the_repository, basename, pack_tmp_name,
written_list, nr_written, NULL, pack_idx_opts, hash, written_list, nr_written, NULL, pack_idx_opts, hash,
&idx_tmp_name); &idx_tmp_name);
rename_tmp_packfile_idx(basename, &idx_tmp_name); rename_tmp_packfile_idx(basename, &idx_tmp_name);
@@ -244,7 +244,7 @@ static void prepare_to_stream(struct bulk_checkin_packfile *state,
if (!(flags & HASH_WRITE_OBJECT) || state->f) if (!(flags & HASH_WRITE_OBJECT) || state->f)
return; return;
state->f = create_tmp_packfile(&state->pack_tmp_name); state->f = create_tmp_packfile(the_repository, &state->pack_tmp_name);
reset_pack_idx_option(&state->pack_idx_opts); reset_pack_idx_option(&state->pack_idx_opts);
/* Pretend we are going to write only one object */ /* Pretend we are going to write only one object */

2
midx-write.c
View File

@@ -658,7 +658,7 @@ static void write_midx_reverse_index(char *midx_name, unsigned char *midx_hash,
strbuf_addf(&buf, "%s-%s.rev", midx_name, hash_to_hex_algop(midx_hash, strbuf_addf(&buf, "%s-%s.rev", midx_name, hash_to_hex_algop(midx_hash,
ctx->repo->hash_algo)); ctx->repo->hash_algo));
tmp_file = write_rev_file_order(ctx->repo->hash_algo, NULL, ctx->pack_order, tmp_file = write_rev_file_order(ctx->repo, NULL, ctx->pack_order,
ctx->entries_nr, midx_hash, WRITE_REV); ctx->entries_nr, midx_hash, WRITE_REV);
if (finalize_object_file(tmp_file, buf.buf)) if (finalize_object_file(tmp_file, buf.buf))

55
pack-write.c
View File

@@ -1,5 +1,3 @@
#define USE_THE_REPOSITORY_VARIABLE
#include "git-compat-util.h" #include "git-compat-util.h"
#include "environment.h" #include "environment.h"
#include "gettext.h" #include "gettext.h"
@@ -56,7 +54,7 @@ static int need_large_offset(off_t offset, const struct pack_idx_option *opts)
* The *sha1 contains the pack content SHA1 hash. * The *sha1 contains the pack content SHA1 hash.
* The objects array passed in will be sorted by SHA1 on exit. * The objects array passed in will be sorted by SHA1 on exit.
*/ */
const char *write_idx_file(const struct git_hash_algo *hash_algo, const char *write_idx_file(struct repository *repo,
const char *index_name, struct pack_idx_entry **objects, const char *index_name, struct pack_idx_entry **objects,
int nr_objects, const struct pack_idx_option *opts, int nr_objects, const struct pack_idx_option *opts,
const unsigned char *sha1) const unsigned char *sha1)
@@ -82,7 +80,7 @@ const char *write_idx_file(const struct git_hash_algo *hash_algo,
if (opts->flags & WRITE_IDX_VERIFY) { if (opts->flags & WRITE_IDX_VERIFY) {
assert(index_name); assert(index_name);
f = hashfd_check(the_repository->hash_algo, index_name); f = hashfd_check(repo->hash_algo, index_name);
} else { } else {
if (!index_name) { if (!index_name) {
struct strbuf tmp_file = STRBUF_INIT; struct strbuf tmp_file = STRBUF_INIT;
@@ -92,7 +90,7 @@ const char *write_idx_file(const struct git_hash_algo *hash_algo,
unlink(index_name); unlink(index_name);
fd = xopen(index_name, O_CREAT|O_EXCL|O_WRONLY, 0600); fd = xopen(index_name, O_CREAT|O_EXCL|O_WRONLY, 0600);
} }
f = hashfd(the_repository->hash_algo, fd, index_name); f = hashfd(repo->hash_algo, fd, index_name);
} }
/* if last object's offset is >= 2^31 we should use index V2 */ /* if last object's offset is >= 2^31 we should use index V2 */
@@ -131,7 +129,7 @@ const char *write_idx_file(const struct git_hash_algo *hash_algo,
struct pack_idx_entry *obj = *list++; struct pack_idx_entry *obj = *list++;
if (index_version < 2) if (index_version < 2)
hashwrite_be32(f, obj->offset); hashwrite_be32(f, obj->offset);
hashwrite(f, obj->oid.hash, hash_algo->rawsz); hashwrite(f, obj->oid.hash, repo->hash_algo->rawsz);
if ((opts->flags & WRITE_IDX_STRICT) && if ((opts->flags & WRITE_IDX_STRICT) &&
(i && oideq(&list[-2]->oid, &obj->oid))) (i && oideq(&list[-2]->oid, &obj->oid)))
die("The same object %s appears twice in the pack", die("The same object %s appears twice in the pack",
@@ -173,7 +171,7 @@ const char *write_idx_file(const struct git_hash_algo *hash_algo,
} }
} }
hashwrite(f, sha1, hash_algo->rawsz); hashwrite(f, sha1, repo->hash_algo->rawsz);
finalize_hashfile(f, NULL, FSYNC_COMPONENT_PACK_METADATA, finalize_hashfile(f, NULL, FSYNC_COMPONENT_PACK_METADATA,
CSUM_HASH_IN_STREAM | CSUM_CLOSE | CSUM_HASH_IN_STREAM | CSUM_CLOSE |
((opts->flags & WRITE_IDX_VERIFY) ? 0 : CSUM_FSYNC)); ((opts->flags & WRITE_IDX_VERIFY) ? 0 : CSUM_FSYNC));
@@ -217,7 +215,7 @@ static void write_rev_trailer(const struct git_hash_algo *hash_algo,
hashwrite(f, hash, hash_algo->rawsz); hashwrite(f, hash, hash_algo->rawsz);
} }
char *write_rev_file(const struct git_hash_algo *hash_algo, char *write_rev_file(struct repository *repo,
const char *rev_name, const char *rev_name,
struct pack_idx_entry **objects, struct pack_idx_entry **objects,
uint32_t nr_objects, uint32_t nr_objects,
@@ -236,7 +234,7 @@ char *write_rev_file(const struct git_hash_algo *hash_algo,
pack_order[i] = i; pack_order[i] = i;
QSORT_S(pack_order, nr_objects, pack_order_cmp, objects); QSORT_S(pack_order, nr_objects, pack_order_cmp, objects);
ret = write_rev_file_order(hash_algo, rev_name, pack_order, nr_objects, ret = write_rev_file_order(repo, rev_name, pack_order, nr_objects,
hash, flags); hash, flags);
free(pack_order); free(pack_order);
@@ -244,7 +242,7 @@ char *write_rev_file(const struct git_hash_algo *hash_algo,
return ret; return ret;
} }
char *write_rev_file_order(const struct git_hash_algo *hash_algo, char *write_rev_file_order(struct repository *repo,
const char *rev_name, const char *rev_name,
uint32_t *pack_order, uint32_t *pack_order,
uint32_t nr_objects, uint32_t nr_objects,
@@ -268,7 +266,7 @@ char *write_rev_file_order(const struct git_hash_algo *hash_algo,
fd = xopen(rev_name, O_CREAT|O_EXCL|O_WRONLY, 0600); fd = xopen(rev_name, O_CREAT|O_EXCL|O_WRONLY, 0600);
path = xstrdup(rev_name); path = xstrdup(rev_name);
} }
f = hashfd(the_repository->hash_algo, fd, path); f = hashfd(repo->hash_algo, fd, path);
} else if (flags & WRITE_REV_VERIFY) { } else if (flags & WRITE_REV_VERIFY) {
struct stat statbuf; struct stat statbuf;
if (stat(rev_name, &statbuf)) { if (stat(rev_name, &statbuf)) {
@@ -278,18 +276,18 @@ char *write_rev_file_order(const struct git_hash_algo *hash_algo,
} else } else
die_errno(_("could not stat: %s"), rev_name); die_errno(_("could not stat: %s"), rev_name);
} }
f = hashfd_check(the_repository->hash_algo, rev_name); f = hashfd_check(repo->hash_algo, rev_name);
path = xstrdup(rev_name); path = xstrdup(rev_name);
} else { } else {
return NULL; return NULL;
} }
write_rev_header(hash_algo, f); write_rev_header(repo->hash_algo, f);
write_rev_index_positions(f, pack_order, nr_objects); write_rev_index_positions(f, pack_order, nr_objects);
write_rev_trailer(hash_algo, f, hash); write_rev_trailer(repo->hash_algo, f, hash);
if (adjust_shared_perm(the_repository, path) < 0) if (adjust_shared_perm(repo, path) < 0)
die(_("failed to make %s readable"), path); die(_("failed to make %s readable"), path);
finalize_hashfile(f, NULL, FSYNC_COMPONENT_PACK_METADATA, finalize_hashfile(f, NULL, FSYNC_COMPONENT_PACK_METADATA,
@@ -330,7 +328,7 @@ static void write_mtimes_trailer(const struct git_hash_algo *hash_algo,
hashwrite(f, hash, hash_algo->rawsz); hashwrite(f, hash, hash_algo->rawsz);
} }
static char *write_mtimes_file(const struct git_hash_algo *hash_algo, static char *write_mtimes_file(struct repository *repo,
struct packing_data *to_pack, struct packing_data *to_pack,
struct pack_idx_entry **objects, struct pack_idx_entry **objects,
uint32_t nr_objects, uint32_t nr_objects,
@@ -346,13 +344,13 @@ static char *write_mtimes_file(const struct git_hash_algo *hash_algo,
fd = odb_mkstemp(&tmp_file, "pack/tmp_mtimes_XXXXXX"); fd = odb_mkstemp(&tmp_file, "pack/tmp_mtimes_XXXXXX");
mtimes_name = strbuf_detach(&tmp_file, NULL); mtimes_name = strbuf_detach(&tmp_file, NULL);
f = hashfd(the_repository->hash_algo, fd, mtimes_name); f = hashfd(repo->hash_algo, fd, mtimes_name);
write_mtimes_header(hash_algo, f); write_mtimes_header(repo->hash_algo, f);
write_mtimes_objects(f, to_pack, objects, nr_objects); write_mtimes_objects(f, to_pack, objects, nr_objects);
write_mtimes_trailer(hash_algo, f, hash); write_mtimes_trailer(repo->hash_algo, f, hash);
if (adjust_shared_perm(the_repository, mtimes_name) < 0) if (adjust_shared_perm(repo, mtimes_name) < 0)
die(_("failed to make %s readable"), mtimes_name); die(_("failed to make %s readable"), mtimes_name);
finalize_hashfile(f, NULL, FSYNC_COMPONENT_PACK_METADATA, finalize_hashfile(f, NULL, FSYNC_COMPONENT_PACK_METADATA,
@@ -527,14 +525,15 @@ int encode_in_pack_object_header(unsigned char *hdr, int hdr_len,
return n; return n;
} }
struct hashfile *create_tmp_packfile(char **pack_tmp_name) struct hashfile *create_tmp_packfile(struct repository *repo,
char **pack_tmp_name)
{ {
struct strbuf tmpname = STRBUF_INIT; struct strbuf tmpname = STRBUF_INIT;
int fd; int fd;
fd = odb_mkstemp(&tmpname, "pack/tmp_pack_XXXXXX"); fd = odb_mkstemp(&tmpname, "pack/tmp_pack_XXXXXX");
*pack_tmp_name = strbuf_detach(&tmpname, NULL); *pack_tmp_name = strbuf_detach(&tmpname, NULL);
return hashfd(the_repository->hash_algo, fd, *pack_tmp_name); return hashfd(repo->hash_algo, fd, *pack_tmp_name);
} }
static void rename_tmp_packfile(struct strbuf *name_prefix, const char *source, static void rename_tmp_packfile(struct strbuf *name_prefix, const char *source,
@@ -555,7 +554,7 @@ void rename_tmp_packfile_idx(struct strbuf *name_buffer,
rename_tmp_packfile(name_buffer, *idx_tmp_name, "idx"); rename_tmp_packfile(name_buffer, *idx_tmp_name, "idx");
} }
void stage_tmp_packfiles(const struct git_hash_algo *hash_algo, void stage_tmp_packfiles(struct repository *repo,
struct strbuf *name_buffer, struct strbuf *name_buffer,
const char *pack_tmp_name, const char *pack_tmp_name,
struct pack_idx_entry **written_list, struct pack_idx_entry **written_list,
@@ -568,19 +567,19 @@ void stage_tmp_packfiles(const struct git_hash_algo *hash_algo,
char *rev_tmp_name = NULL; char *rev_tmp_name = NULL;
char *mtimes_tmp_name = NULL; char *mtimes_tmp_name = NULL;
if (adjust_shared_perm(the_repository, pack_tmp_name)) if (adjust_shared_perm(repo, pack_tmp_name))
die_errno("unable to make temporary pack file readable"); die_errno("unable to make temporary pack file readable");
*idx_tmp_name = (char *)write_idx_file(hash_algo, NULL, written_list, *idx_tmp_name = (char *)write_idx_file(repo, NULL, written_list,
nr_written, pack_idx_opts, hash); nr_written, pack_idx_opts, hash);
if (adjust_shared_perm(the_repository, *idx_tmp_name)) if (adjust_shared_perm(repo, *idx_tmp_name))
die_errno("unable to make temporary index file readable"); die_errno("unable to make temporary index file readable");
rev_tmp_name = write_rev_file(hash_algo, NULL, written_list, nr_written, rev_tmp_name = write_rev_file(repo, NULL, written_list, nr_written,
hash, pack_idx_opts->flags); hash, pack_idx_opts->flags);
if (pack_idx_opts->flags & WRITE_MTIMES) { if (pack_idx_opts->flags & WRITE_MTIMES) {
mtimes_tmp_name = write_mtimes_file(hash_algo, to_pack, mtimes_tmp_name = write_mtimes_file(repo, to_pack,
written_list, nr_written, written_list, nr_written,
hash); hash);
} }

11
pack.h
View File

@@ -87,7 +87,7 @@ struct progress;
/* Note, the data argument could be NULL if object type is blob */ /* Note, the data argument could be NULL if object type is blob */
typedef int (*verify_fn)(const struct object_id *, enum object_type, unsigned long, void*, int*); typedef int (*verify_fn)(const struct object_id *, enum object_type, unsigned long, void*, int*);
const char *write_idx_file(const struct git_hash_algo *hash_algo, const char *write_idx_file(struct repository *repo,
const char *index_name, const char *index_name,
struct pack_idx_entry **objects, struct pack_idx_entry **objects,
int nr_objects, int nr_objects,
@@ -106,13 +106,13 @@ struct ref;
void write_promisor_file(const char *promisor_name, struct ref **sought, int nr_sought); void write_promisor_file(const char *promisor_name, struct ref **sought, int nr_sought);
char *write_rev_file(const struct git_hash_algo *hash_algo, char *write_rev_file(struct repository *repo,
const char *rev_name, const char *rev_name,
struct pack_idx_entry **objects, struct pack_idx_entry **objects,
uint32_t nr_objects, uint32_t nr_objects,
const unsigned char *hash, const unsigned char *hash,
unsigned flags); unsigned flags);
char *write_rev_file_order(const struct git_hash_algo *hash_algo, char *write_rev_file_order(struct repository *repo,
const char *rev_name, const char *rev_name,
uint32_t *pack_order, uint32_t *pack_order,
uint32_t nr_objects, uint32_t nr_objects,
@@ -134,8 +134,9 @@ int read_pack_header(int fd, struct pack_header *);
struct packing_data; struct packing_data;
struct hashfile *create_tmp_packfile(char **pack_tmp_name); struct hashfile *create_tmp_packfile(struct repository *repo,
void stage_tmp_packfiles(const struct git_hash_algo *hash_algo, char **pack_tmp_name);
void stage_tmp_packfiles(struct repository *repo,
struct strbuf *name_buffer, struct strbuf *name_buffer,
const char *pack_tmp_name, const char *pack_tmp_name,
struct pack_idx_entry **written_list, struct pack_idx_entry **written_list,