From f4836570a7adbd8c70ad7a8edf6ae5a977647c06 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 14 Jun 2024 08:49:50 +0200 Subject: hash: require hash algorithm in `hasheq()`, `hashcmp()` and `hashclr()` Many of our hash functions have two variants, one receiving a `struct git_hash_algo` and one that derives it via `the_repository`. Adapt all of those functions to always require the hash algorithm as input and drop the variants that do not accept one. As those functions are now independent of `the_repository`, we can move them from "hash.h" to "hash-ll.h". Note that both in this and subsequent commits in this series we always just pass `the_repository->hash_algo` as input even if it is obvious that there is a repository in the context that we should be using the hash from instead. This is done to be on the safe side and not introduce any regressions. All callsites should eventually be amended to use a repo passed via parameters, but this is outside the scope of this patch series. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- commit-graph.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'commit-graph.c') diff --git a/commit-graph.c b/commit-graph.c index e5dd3553df..3429156b28 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -565,7 +565,8 @@ static int add_graph_to_chain(struct commit_graph *g, if (!cur_g || !oideq(&oids[n], &cur_g->oid) || - !hasheq(oids[n].hash, g->chunk_base_graphs + st_mult(g->hash_len, n))) { + !hasheq(oids[n].hash, g->chunk_base_graphs + st_mult(g->hash_len, n), + the_repository->hash_algo)) { warning(_("commit-graph chain does not match")); return 0; } -- cgit v1.2.3 From 9da95bda74cf10e1475384a71fd20914c3b99784 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 14 Jun 2024 08:49:54 +0200 Subject: hash: require hash algorithm in `oidread()` and `oidclr()` Both `oidread()` and `oidclr()` use `the_repository` to derive the hash function that shall be used. Require callers to pass in the hash algorithm to get rid of this implicit dependency. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- apply.c | 2 +- blame.c | 2 +- builtin/am.c | 8 ++++---- builtin/fast-export.c | 2 +- builtin/fast-import.c | 39 +++++++++++++++++++++------------------ builtin/fetch-pack.c | 4 ++-- builtin/index-pack.c | 5 +++-- builtin/log.c | 2 +- builtin/merge.c | 4 ++-- builtin/notes.c | 2 +- builtin/pack-objects.c | 3 ++- builtin/pack-redundant.c | 2 +- builtin/patch-id.c | 6 +++--- builtin/pull.c | 6 +++--- builtin/receive-pack.c | 2 +- builtin/replace.c | 2 +- builtin/rm.c | 2 +- builtin/tag.c | 2 +- builtin/unpack-objects.c | 6 +++--- builtin/update-ref.c | 8 ++++---- cache-tree.c | 3 ++- commit-graph.c | 17 +++++++++++------ diff-lib.c | 4 ++-- diff.c | 6 +++--- dir.c | 6 +++--- hash-ll.h | 14 ++++++++++++++ hash.h | 17 ----------------- http-push.c | 2 +- http-walker.c | 2 +- match-trees.c | 2 +- midx.c | 3 ++- notes-merge.c | 6 +++--- notes.c | 8 ++++---- object-file-convert.c | 2 +- object-file.c | 4 ++-- packfile.c | 10 ++++++---- read-cache.c | 8 +++++--- refs.c | 6 +++--- refs/files-backend.c | 6 +++--- refs/packed-backend.c | 6 +++--- refs/reftable-backend.c | 37 +++++++++++++++++++++++-------------- remote.c | 8 ++++---- resolve-undo.c | 3 ++- sequencer.c | 4 ++-- split-index.c | 2 +- submodule-config.c | 2 +- t/helper/test-submodule-config.c | 2 +- tree-walk.c | 4 ++-- 48 files changed, 163 insertions(+), 140 deletions(-) (limited to 'commit-graph.c') diff --git a/apply.c b/apply.c index 901b67e625..528939abb6 100644 --- a/apply.c +++ b/apply.c @@ -3680,7 +3680,7 @@ static int try_threeway(struct apply_state *state, if (status) { patch->conflicted_threeway = 1; if (patch->is_new) - oidclr(&patch->threeway_stage[0]); + oidclr(&patch->threeway_stage[0], the_repository->hash_algo); else oidcpy(&patch->threeway_stage[0], &pre_oid); oidcpy(&patch->threeway_stage[1], &our_oid); diff --git a/blame.c b/blame.c index 33586b9777..a80f5e2e61 100644 --- a/blame.c +++ b/blame.c @@ -1246,7 +1246,7 @@ static int fill_blob_sha1_and_mode(struct repository *r, goto error_out; return 0; error_out: - oidclr(&origin->blob_oid); + oidclr(&origin->blob_oid, the_repository->hash_algo); origin->mode = S_IFINVALID; return -1; } diff --git a/builtin/am.c b/builtin/am.c index 36839029d2..45c305ec86 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -408,7 +408,7 @@ static void am_load(struct am_state *state) read_commit_msg(state); if (read_state_file(&sb, state, "original-commit", 1) < 0) - oidclr(&state->orig_commit); + oidclr(&state->orig_commit, the_repository->hash_algo); else if (get_oid_hex(sb.buf, &state->orig_commit) < 0) die(_("could not parse %s"), am_path(state, "original-commit")); @@ -1121,7 +1121,7 @@ static void am_next(struct am_state *state) unlink(am_path(state, "author-script")); unlink(am_path(state, "final-commit")); - oidclr(&state->orig_commit); + oidclr(&state->orig_commit, the_repository->hash_algo); unlink(am_path(state, "original-commit")); refs_delete_ref(get_main_ref_store(the_repository), NULL, "REBASE_HEAD", NULL, REF_NO_DEREF); @@ -2151,11 +2151,11 @@ static int safe_to_abort(const struct am_state *state) if (get_oid_hex(sb.buf, &abort_safety)) die(_("could not parse %s"), am_path(state, "abort-safety")); } else - oidclr(&abort_safety); + oidclr(&abort_safety, the_repository->hash_algo); strbuf_release(&sb); if (repo_get_oid(the_repository, "HEAD", &head)) - oidclr(&head); + oidclr(&head, the_repository->hash_algo); if (oideq(&head, &abort_safety)) return 1; diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 4693d18cc9..4b6e8c6832 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -415,7 +415,7 @@ static char *generate_fake_oid(void) struct object_id oid; char *hex = xmallocz(GIT_MAX_HEXSZ); - oidclr(&oid); + oidclr(&oid, the_repository->hash_algo); put_be32(oid.hash + hashsz - 4, counter++); return oid_to_hex_r(hex, &oid); } diff --git a/builtin/fast-import.c b/builtin/fast-import.c index d1c0243d04..12543488f3 100644 --- a/builtin/fast-import.c +++ b/builtin/fast-import.c @@ -1279,8 +1279,10 @@ static void load_tree(struct tree_entry *root) e->versions[0].mode = e->versions[1].mode; e->name = to_atom(c, strlen(c)); c += e->name->str_len + 1; - oidread(&e->versions[0].oid, (unsigned char *)c); - oidread(&e->versions[1].oid, (unsigned char *)c); + oidread(&e->versions[0].oid, (unsigned char *)c, + the_repository->hash_algo); + oidread(&e->versions[1].oid, (unsigned char *)c, + the_repository->hash_algo); c += the_hash_algo->rawsz; } free(buf); @@ -1386,7 +1388,7 @@ static void tree_content_replace( { if (!S_ISDIR(mode)) die("Root cannot be a non-directory"); - oidclr(&root->versions[0].oid); + oidclr(&root->versions[0].oid, the_repository->hash_algo); oidcpy(&root->versions[1].oid, oid); if (root->tree) release_tree_content_recursive(root->tree); @@ -1445,7 +1447,7 @@ static int tree_content_set( if (S_ISDIR(e->versions[0].mode)) e->versions[0].mode |= NO_DELTA; - oidclr(&root->versions[1].oid); + oidclr(&root->versions[1].oid, the_repository->hash_algo); return 1; } if (!S_ISDIR(e->versions[1].mode)) { @@ -1455,7 +1457,7 @@ static int tree_content_set( if (!e->tree) load_tree(e); if (tree_content_set(e, slash1 + 1, oid, mode, subtree)) { - oidclr(&root->versions[1].oid); + oidclr(&root->versions[1].oid, the_repository->hash_algo); return 1; } return 0; @@ -1467,7 +1469,7 @@ static int tree_content_set( e = new_tree_entry(); e->name = to_atom(p, n); e->versions[0].mode = 0; - oidclr(&e->versions[0].oid); + oidclr(&e->versions[0].oid, the_repository->hash_algo); t->entries[t->entry_count++] = e; if (*slash1) { e->tree = new_tree_content(8); @@ -1478,7 +1480,7 @@ static int tree_content_set( e->versions[1].mode = mode; oidcpy(&e->versions[1].oid, oid); } - oidclr(&root->versions[1].oid); + oidclr(&root->versions[1].oid, the_repository->hash_algo); return 1; } @@ -1523,7 +1525,8 @@ static int tree_content_remove( if (tree_content_remove(e, slash1 + 1, backup_leaf, 0)) { for (n = 0; n < e->tree->entry_count; n++) { if (e->tree->entries[n]->versions[1].mode) { - oidclr(&root->versions[1].oid); + oidclr(&root->versions[1].oid, + the_repository->hash_algo); return 1; } } @@ -1542,8 +1545,8 @@ del_entry: release_tree_content_recursive(e->tree); e->tree = NULL; e->versions[1].mode = 0; - oidclr(&e->versions[1].oid); - oidclr(&root->versions[1].oid); + oidclr(&e->versions[1].oid, the_repository->hash_algo); + oidclr(&root->versions[1].oid, the_repository->hash_algo); return 1; } @@ -1609,7 +1612,7 @@ static int update_branch(struct branch *b) return 0; } if (refs_read_ref(get_main_ref_store(the_repository), b->name, &old_oid)) - oidclr(&old_oid); + oidclr(&old_oid, the_repository->hash_algo); if (!force_update && !is_null_oid(&old_oid)) { struct commit *old_cmit, *new_cmit; int ret; @@ -2550,8 +2553,8 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa static void file_change_deleteall(struct branch *b) { release_tree_content_recursive(b->branch_tree.tree); - oidclr(&b->branch_tree.versions[0].oid); - oidclr(&b->branch_tree.versions[1].oid); + oidclr(&b->branch_tree.versions[0].oid, the_repository->hash_algo); + oidclr(&b->branch_tree.versions[1].oid, the_repository->hash_algo); load_tree(&b->branch_tree); b->num_notes = 0; } @@ -2570,8 +2573,8 @@ static void parse_from_commit(struct branch *b, char *buf, unsigned long size) static void parse_from_existing(struct branch *b) { if (is_null_oid(&b->oid)) { - oidclr(&b->branch_tree.versions[0].oid); - oidclr(&b->branch_tree.versions[1].oid); + oidclr(&b->branch_tree.versions[0].oid, the_repository->hash_algo); + oidclr(&b->branch_tree.versions[1].oid, the_repository->hash_algo); } else { unsigned long size; char *buf; @@ -2894,9 +2897,9 @@ static void parse_reset_branch(const char *arg) b = lookup_branch(arg); if (b) { - oidclr(&b->oid); - oidclr(&b->branch_tree.versions[0].oid); - oidclr(&b->branch_tree.versions[1].oid); + oidclr(&b->oid, the_repository->hash_algo); + oidclr(&b->branch_tree.versions[0].oid, the_repository->hash_algo); + oidclr(&b->branch_tree.versions[1].oid, the_repository->hash_algo); if (b->branch_tree.tree) { release_tree_content_recursive(b->branch_tree.tree); b->branch_tree.tree = NULL; diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index 44c05ee86c..af329e8d5c 100644 --- a/builtin/fetch-pack.c +++ b/builtin/fetch-pack.c @@ -29,11 +29,11 @@ static void add_sought_entry(struct ref ***sought, int *nr, int *alloc, ; /* , leave oid as name */ } else { /* , clear cruft from oid */ - oidclr(&oid); + oidclr(&oid, the_repository->hash_algo); } } else { /* , clear cruft from get_oid_hex */ - oidclr(&oid); + oidclr(&oid, the_repository->hash_algo); } ref = alloc_ref(name); diff --git a/builtin/index-pack.c b/builtin/index-pack.c index ea727fba16..fd968d673d 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -528,7 +528,8 @@ static void *unpack_raw_entry(struct object_entry *obj, switch (obj->type) { case OBJ_REF_DELTA: - oidread(ref_oid, fill(the_hash_algo->rawsz)); + oidread(ref_oid, fill(the_hash_algo->rawsz), + the_repository->hash_algo); use(the_hash_algo->rawsz); break; case OBJ_OFS_DELTA: @@ -1372,7 +1373,7 @@ static struct object_entry *append_obj_to_pack(struct hashfile *f, obj[1].idx.offset += write_compressed(f, buf, size); obj[0].idx.crc32 = crc32_end(f); hashflush(f); - oidread(&obj->idx.oid, sha1); + oidread(&obj->idx.oid, sha1, the_repository->hash_algo); return obj; } diff --git a/builtin/log.c b/builtin/log.c index 78a247d8a9..ccbda8a005 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1938,7 +1938,7 @@ static void print_bases(struct base_tree_info *bases, FILE *file) free(bases->patch_id); bases->nr_patch_id = 0; bases->alloc_patch_id = 0; - oidclr(&bases->base_commit); + oidclr(&bases->base_commit, the_repository->hash_algo); } static const char *diff_title(struct strbuf *sb, diff --git a/builtin/merge.c b/builtin/merge.c index daed2d4e1e..abe66311c7 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -494,7 +494,7 @@ static void merge_name(const char *remote, struct strbuf *msg) strbuf_branchname(&bname, remote, 0); remote = bname.buf; - oidclr(&branch_head); + oidclr(&branch_head, the_repository->hash_algo); remote_head = get_merge_parent(remote); if (!remote_head) die(_("'%s' does not point to a commit"), remote); @@ -1690,7 +1690,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) * index and working tree polluted. */ if (save_state(&stash)) - oidclr(&stash); + oidclr(&stash, the_repository->hash_algo); for (i = 0; i < use_strategies_nr; i++) { int ret, cnt; diff --git a/builtin/notes.c b/builtin/notes.c index 7f80b3449b..d9c356e354 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -828,7 +828,7 @@ static int merge_commit(struct notes_merge_options *o) if (partial->parents) oidcpy(&parent_oid, &partial->parents->item->object.oid); else - oidclr(&parent_oid); + oidclr(&parent_oid, the_repository->hash_algo); CALLOC_ARRAY(t, 1); init_notes(t, "NOTES_MERGE_PARTIAL", combine_notes_overwrite, 0); diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 638f5c57f0..2b00983a99 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2078,7 +2078,8 @@ static void check_object(struct object_entry *entry, uint32_t object_index) oidread(&base_ref, use_pack(p, &w_curs, entry->in_pack_offset + used, - NULL)); + NULL), + the_repository->hash_algo); have_base = 1; } entry->in_pack_header_size = used + the_hash_algo->rawsz; diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c index 103c11b9d3..dd9bf35f5b 100644 --- a/builtin/pack-redundant.c +++ b/builtin/pack-redundant.c @@ -100,7 +100,7 @@ static inline struct llist_item *llist_insert(struct llist *list, const unsigned char *oid) { struct llist_item *new_item = llist_item_get(); - oidread(&new_item->oid, oid); + oidread(&new_item->oid, oid, the_repository->hash_algo); new_item->next = NULL; if (after) { diff --git a/builtin/patch-id.c b/builtin/patch-id.c index 583099cacf..d790ae6354 100644 --- a/builtin/patch-id.c +++ b/builtin/patch-id.c @@ -70,7 +70,7 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result, git_hash_ctx ctx; the_hash_algo->init_fn(&ctx); - oidclr(result); + oidclr(result, the_repository->hash_algo); while (strbuf_getwholeline(line_buf, stdin, '\n') != EOF) { char *line = line_buf->buf; @@ -166,7 +166,7 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result, } if (!found_next) - oidclr(next_oid); + oidclr(next_oid, the_repository->hash_algo); flush_one_hunk(result, &ctx); @@ -179,7 +179,7 @@ static void generate_id_list(int stable, int verbatim) int patchlen; struct strbuf line_buf = STRBUF_INIT; - oidclr(&oid); + oidclr(&oid, the_repository->hash_algo); while (!feof(stdin)) { patchlen = get_one_patchid(&n, &result, &line_buf, stable, verbatim); flush_current_id(patchlen, &oid, &result); diff --git a/builtin/pull.c b/builtin/pull.c index d622202bce..2a73e673f3 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -1038,7 +1038,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix) die_conclude_merge(); if (repo_get_oid(the_repository, "HEAD", &orig_head)) - oidclr(&orig_head); + oidclr(&orig_head, the_repository->hash_algo); if (opt_rebase) { if (opt_autostash == -1) @@ -1053,7 +1053,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix) _("Please commit or stash them."), 1, 0); if (get_rebase_fork_point(&rebase_fork_point, repo, *refspecs)) - oidclr(&rebase_fork_point); + oidclr(&rebase_fork_point, the_repository->hash_algo); } if (run_fetch(repo, refspecs)) @@ -1063,7 +1063,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix) return 0; if (repo_get_oid(the_repository, "HEAD", &curr_head)) - oidclr(&curr_head); + oidclr(&curr_head, the_repository->hash_algo); if (!is_null_oid(&orig_head) && !is_null_oid(&curr_head) && !oideq(&orig_head, &curr_head)) { diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 01c1f04ece..aa5ba27d17 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -741,7 +741,7 @@ static void prepare_push_cert_sha1(struct child_process *proc) already_done = 1; if (write_object_file(push_cert.buf, push_cert.len, OBJ_BLOB, &push_cert_oid)) - oidclr(&push_cert_oid); + oidclr(&push_cert_oid, the_repository->hash_algo); memset(&sigcheck, '\0', sizeof(sigcheck)); diff --git a/builtin/replace.c b/builtin/replace.c index ce9f6974d2..1ef833c07f 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -167,7 +167,7 @@ static int check_ref_valid(struct object_id *object, return error(_("'%s' is not a valid ref name"), ref->buf); if (refs_read_ref(get_main_ref_store(the_repository), ref->buf, prev)) - oidclr(prev); + oidclr(prev, the_repository->hash_algo); else if (!force) return error(_("replace ref '%s' already exists"), ref->buf); return 0; diff --git a/builtin/rm.c b/builtin/rm.c index d195c16e74..0e79cbab62 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -377,7 +377,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix) if (!force) { struct object_id oid; if (repo_get_oid(the_repository, "HEAD", &oid)) - oidclr(&oid); + oidclr(&oid, the_repository->hash_algo); if (check_local_mod(&oid, index_only)) exit(1); } diff --git a/builtin/tag.c b/builtin/tag.c index 6e2c0cf342..a1fb218512 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -650,7 +650,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix) die(_("'%s' is not a valid tag name."), tag); if (refs_read_ref(get_main_ref_store(the_repository), ref.buf, &prev)) - oidclr(&prev); + oidclr(&prev, the_repository->hash_algo); else if (!force) die(_("tag '%s' already exists"), tag); diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index 0855572c27..08fa2a7a74 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -439,7 +439,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size, struct object_id base_oid; if (type == OBJ_REF_DELTA) { - oidread(&base_oid, fill(the_hash_algo->rawsz)); + oidread(&base_oid, fill(the_hash_algo->rawsz), the_repository->hash_algo); use(the_hash_algo->rawsz); delta_data = get_data(delta_size); if (!delta_data) @@ -451,7 +451,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size, return; /* we are done */ else { /* cannot resolve yet --- queue it */ - oidclr(&obj_list[nr].oid); + oidclr(&obj_list[nr].oid, the_repository->hash_algo); add_delta_to_list(nr, &base_oid, 0, delta_data, delta_size); return; } @@ -500,7 +500,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size, * The delta base object is itself a delta that * has not been resolved yet. */ - oidclr(&obj_list[nr].oid); + oidclr(&obj_list[nr].oid, the_repository->hash_algo); add_delta_to_list(nr, null_oid(), base_offset, delta_data, delta_size); return; diff --git a/builtin/update-ref.c b/builtin/update-ref.c index 6cda1c08aa..f8a5b087f8 100644 --- a/builtin/update-ref.c +++ b/builtin/update-ref.c @@ -122,7 +122,7 @@ static int parse_next_oid(const char **next, const char *end, goto invalid; } else { /* Without -z, an empty value means all zeros: */ - oidclr(oid); + oidclr(oid, the_repository->hash_algo); } } else { /* With -z, read the next NUL-terminated line */ @@ -142,7 +142,7 @@ static int parse_next_oid(const char **next, const char *end, /* With -z, treat an empty value as all zeros: */ warning("%s %s: missing , treating as zero", command, refname); - oidclr(oid); + oidclr(oid, the_repository->hash_algo); } else { /* * With -z, an empty non-required value means @@ -291,7 +291,7 @@ static void parse_cmd_verify(struct ref_transaction *transaction, if (parse_next_oid(&next, end, &old_oid, "verify", refname, PARSE_SHA1_OLD)) - oidclr(&old_oid); + oidclr(&old_oid, the_repository->hash_algo); if (*next != line_termination) die("verify %s: extra input: %s", refname, next); @@ -564,7 +564,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix) * The empty string implies that the reference * must not already exist: */ - oidclr(&oldoid); + oidclr(&oldoid, the_repository->hash_algo); else if (repo_get_oid(the_repository, oldval, &oldoid)) die("%s: not a valid old SHA1", oldval); } diff --git a/cache-tree.c b/cache-tree.c index 387c0a3e5b..e4255c4d02 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -578,7 +578,8 @@ static struct cache_tree *read_one(const char **buffer, unsigned long *size_p) if (0 <= it->entry_count) { if (size < rawsz) goto free_return; - oidread(&it->oid, (const unsigned char *)buf); + oidread(&it->oid, (const unsigned char *)buf, + the_repository->hash_algo); buf += rawsz; size -= rawsz; } diff --git a/commit-graph.c b/commit-graph.c index 3429156b28..98cbd53eea 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -475,7 +475,8 @@ struct commit_graph *parse_commit_graph(struct repo_settings *s, FREE_AND_NULL(graph->bloom_filter_settings); } - oidread(&graph->oid, graph->data + graph->data_len - graph->hash_len); + oidread(&graph->oid, graph->data + graph->data_len - graph->hash_len, + the_repository->hash_algo); free_chunkfile(cf); return graph; @@ -838,7 +839,8 @@ static void load_oid_from_graph(struct commit_graph *g, lex_index = pos - g->num_commits_in_base; - oidread(oid, g->chunk_oid_lookup + st_mult(g->hash_len, lex_index)); + oidread(oid, g->chunk_oid_lookup + st_mult(g->hash_len, lex_index), + the_repository->hash_algo); } static struct commit_list **insert_parent_or_die(struct repository *r, @@ -1080,7 +1082,7 @@ static struct tree *load_tree_for_commit(struct repository *r, commit_data = g->chunk_commit_data + st_mult(GRAPH_DATA_WIDTH, graph_pos - g->num_commits_in_base); - oidread(&oid, commit_data); + oidread(&oid, commit_data, the_repository->hash_algo); set_commit_tree(c, lookup_tree(r, &oid)); return c->maybe_tree; @@ -2556,7 +2558,8 @@ int write_commit_graph(struct object_directory *odb, struct commit_graph *g = ctx->r->objects->commit_graph; for (i = 0; i < g->num_commits; i++) { struct object_id oid; - oidread(&oid, g->chunk_oid_lookup + st_mult(g->hash_len, i)); + oidread(&oid, g->chunk_oid_lookup + st_mult(g->hash_len, i), + the_repository->hash_algo); oid_array_append(&ctx->oids, &oid); } } @@ -2675,7 +2678,8 @@ static int verify_one_commit_graph(struct repository *r, for (i = 0; i < g->num_commits; i++) { struct commit *graph_commit; - oidread(&cur_oid, g->chunk_oid_lookup + st_mult(g->hash_len, i)); + oidread(&cur_oid, g->chunk_oid_lookup + st_mult(g->hash_len, i), + the_repository->hash_algo); if (i && oidcmp(&prev_oid, &cur_oid) >= 0) graph_report(_("commit-graph has incorrect OID order: %s then %s"), @@ -2719,7 +2723,8 @@ static int verify_one_commit_graph(struct repository *r, timestamp_t generation; display_progress(progress, ++(*seen)); - oidread(&cur_oid, g->chunk_oid_lookup + st_mult(g->hash_len, i)); + oidread(&cur_oid, g->chunk_oid_lookup + st_mult(g->hash_len, i), + the_repository->hash_algo); graph_commit = lookup_commit(r, &cur_oid); odb_commit = (struct commit *)create_object(r, &cur_oid, alloc_commit_node(r)); diff --git a/diff-lib.c b/diff-lib.c index 5a5a50c5a1..3fb8d79fef 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -160,7 +160,7 @@ void run_diff_files(struct rev_info *revs, unsigned int option) dpath->next = NULL; memcpy(dpath->path, ce->name, path_len); dpath->path[path_len] = '\0'; - oidclr(&dpath->oid); + oidclr(&dpath->oid, the_repository->hash_algo); memset(&(dpath->parent[0]), 0, sizeof(struct combine_diff_parent)*5); @@ -412,7 +412,7 @@ static int show_modified(struct rev_info *revs, memcpy(p->path, new_entry->name, pathlen); p->path[pathlen] = 0; p->mode = mode; - oidclr(&p->oid); + oidclr(&p->oid, the_repository->hash_algo); memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent)); p->parent[0].status = DIFF_STATUS_MODIFIED; p->parent[0].mode = new_entry->ce_mode; diff --git a/diff.c b/diff.c index e70301df76..60d1f7be81 100644 --- a/diff.c +++ b/diff.c @@ -4567,7 +4567,7 @@ static void diff_fill_oid_info(struct diff_filespec *one, struct index_state *is if (!one->oid_valid) { struct stat st; if (one->is_stdin) { - oidclr(&one->oid); + oidclr(&one->oid, the_repository->hash_algo); return; } if (lstat(one->path, &st) < 0) @@ -4577,7 +4577,7 @@ static void diff_fill_oid_info(struct diff_filespec *one, struct index_state *is } } else - oidclr(&one->oid); + oidclr(&one->oid, the_repository->hash_algo); } static void strip_prefix(int prefix_length, const char **namep, const char **otherp) @@ -6404,7 +6404,7 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid the_hash_algo->init_fn(&ctx); memset(&data, 0, sizeof(struct patch_id_t)); data.ctx = &ctx; - oidclr(oid); + oidclr(oid, the_repository->hash_algo); for (i = 0; i < q->nr; i++) { xpparam_t xpp; diff --git a/dir.c b/dir.c index 45be4ad261..5de421c29c 100644 --- a/dir.c +++ b/dir.c @@ -1687,7 +1687,7 @@ static void prep_exclude(struct dir_struct *dir, } /* Try to read per-directory file */ - oidclr(&oid_stat.oid); + oidclr(&oid_stat.oid, the_repository->hash_algo); oid_stat.valid = 0; if (dir->exclude_per_dir && /* @@ -3794,7 +3794,7 @@ static void read_oid(size_t pos, void *cb) rd->data = rd->end + 1; return; } - oidread(&ud->exclude_oid, rd->data); + oidread(&ud->exclude_oid, rd->data, the_repository->hash_algo); rd->data += the_hash_algo->rawsz; } @@ -3802,7 +3802,7 @@ static void load_oid_stat(struct oid_stat *oid_stat, const unsigned char *data, const unsigned char *sha1) { stat_data_from_disk(&oid_stat->stat, data); - oidread(&oid_stat->oid, sha1); + oidread(&oid_stat->oid, sha1, the_repository->hash_algo); oid_stat->valid = 1; } diff --git a/hash-ll.h b/hash-ll.h index fabdd8ecc7..dbb96369fc 100644 --- a/hash-ll.h +++ b/hash-ll.h @@ -284,6 +284,20 @@ static inline void oidcpy(struct object_id *dst, const struct object_id *src) dst->algo = src->algo; } +static inline void oidread(struct object_id *oid, const unsigned char *hash, + const struct git_hash_algo *algop) +{ + memcpy(oid->hash, hash, algop->rawsz); + oid->algo = hash_algo_by_ptr(algop); +} + +static inline void oidclr(struct object_id *oid, + const struct git_hash_algo *algop) +{ + memset(oid->hash, 0, GIT_MAX_RAWSZ); + oid->algo = hash_algo_by_ptr(algop); +} + static inline struct object_id *oiddup(const struct object_id *src) { struct object_id *dst = xmalloc(sizeof(struct object_id)); diff --git a/hash.h b/hash.h index 714938e2eb..43623a0c86 100644 --- a/hash.h +++ b/hash.h @@ -47,23 +47,6 @@ static inline void oidcpy_with_padding(struct object_id *dst, dst->algo = src->algo; } -static inline void oidclr(struct object_id *oid) -{ - memset(oid->hash, 0, GIT_MAX_RAWSZ); - oid->algo = hash_algo_by_ptr(the_hash_algo); -} - -static inline void oidread_algop(struct object_id *oid, const unsigned char *hash, const struct git_hash_algo *algop) -{ - memcpy(oid->hash, hash, algop->rawsz); - oid->algo = hash_algo_by_ptr(algop); -} - -static inline void oidread(struct object_id *oid, const unsigned char *hash) -{ - oidread_algop(oid, hash, the_hash_algo); -} - static inline int is_empty_blob_oid(const struct object_id *oid) { return oideq(oid, the_hash_algo->empty_blob); diff --git a/http-push.c b/http-push.c index 1fe51226fd..86de238b84 100644 --- a/http-push.c +++ b/http-push.c @@ -1552,7 +1552,7 @@ static void fetch_symref(const char *path, char **symref, struct object_id *oid) free(url); FREE_AND_NULL(*symref); - oidclr(oid); + oidclr(oid, the_repository->hash_algo); if (buffer.len == 0) return; diff --git a/http-walker.c b/http-walker.c index cf7f8c82bc..b7110b6f82 100644 --- a/http-walker.c +++ b/http-walker.c @@ -152,7 +152,7 @@ static void prefetch(struct walker *walker, unsigned char *sha1) newreq = xmalloc(sizeof(*newreq)); newreq->walker = walker; - oidread(&newreq->oid, sha1); + oidread(&newreq->oid, sha1, the_repository->hash_algo); newreq->repo = data->alt; newreq->state = WAITING; newreq->req = NULL; diff --git a/match-trees.c b/match-trees.c index 849b391d3d..50c42e2061 100644 --- a/match-trees.c +++ b/match-trees.c @@ -229,7 +229,7 @@ static int splice_tree(const struct object_id *oid1, const char *prefix, oid_to_hex(oid1)); if (*subpath) { struct object_id tree_oid; - oidread(&tree_oid, rewrite_here); + oidread(&tree_oid, rewrite_here, the_repository->hash_algo); status = splice_tree(&tree_oid, subpath, oid2, &subtree); if (status) return status; diff --git a/midx.c b/midx.c index bc4797196f..1e75f1a7eb 100644 --- a/midx.c +++ b/midx.c @@ -304,7 +304,8 @@ struct object_id *nth_midxed_object_oid(struct object_id *oid, if (n >= m->num_objects) return NULL; - oidread(oid, m->chunk_oid_lookup + st_mult(m->hash_len, n)); + oidread(oid, m->chunk_oid_lookup + st_mult(m->hash_len, n), + the_repository->hash_algo); return oid; } diff --git a/notes-merge.c b/notes-merge.c index 6a9a139b12..801941c2d1 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -240,7 +240,7 @@ static void diff_tree_local(struct notes_merge_options *o, * (will be overwritten by following addition) */ if (oideq(&mp->local, &uninitialized)) - oidclr(&mp->local); + oidclr(&mp->local, the_repository->hash_algo); } else if (is_null_oid(&p->one->oid)) { /* addition */ /* * Either this is a true addition (1), or it is part @@ -556,7 +556,7 @@ int notes_merge(struct notes_merge_options *o, assert(o->local_ref && o->remote_ref); assert(!strcmp(o->local_ref, local_tree->ref)); - oidclr(result_oid); + oidclr(result_oid, the_repository->hash_algo); trace_printf("notes_merge(o->local_ref = %s, o->remote_ref = %s)\n", o->local_ref, o->remote_ref); @@ -579,7 +579,7 @@ int notes_merge(struct notes_merge_options *o, * unborn ref, perform the merge using an empty notes tree. */ if (!check_refname_format(o->remote_ref, 0)) { - oidclr(&remote_oid); + oidclr(&remote_oid, the_repository->hash_algo); remote = NULL; } else { die("Failed to resolve remote notes ref '%s'", diff --git a/notes.c b/notes.c index 5296fd863f..3a8da92fb9 100644 --- a/notes.c +++ b/notes.c @@ -353,7 +353,7 @@ static void add_non_note(struct notes_tree *t, char *path, n->next = NULL; n->path = path; n->mode = mode; - oidread(&n->oid, sha1); + oidread(&n->oid, sha1, the_repository->hash_algo); t->prev_non_note = n; if (!t->first_non_note) { @@ -1036,7 +1036,7 @@ void init_notes(struct notes_tree *t, const char *notes_ref, die("Failed to read notes tree referenced by %s (%s)", notes_ref, oid_to_hex(&object_oid)); - oidclr(&root_tree.key_oid); + oidclr(&root_tree.key_oid, the_repository->hash_algo); oidcpy(&root_tree.val_oid, &oid); load_subtree(t, &root_tree, t->root, 0); } @@ -1146,8 +1146,8 @@ int remove_note(struct notes_tree *t, const unsigned char *object_sha1) if (!t) t = &default_notes_tree; assert(t->initialized); - oidread(&l.key_oid, object_sha1); - oidclr(&l.val_oid); + oidread(&l.key_oid, object_sha1, the_repository->hash_algo); + oidclr(&l.val_oid, the_repository->hash_algo); note_tree_remove(t, t->root, 0, &l); if (is_null_oid(&l.val_oid)) /* no note was removed */ return 1; diff --git a/object-file-convert.c b/object-file-convert.c index 4f6189095b..f684038f7f 100644 --- a/object-file-convert.c +++ b/object-file-convert.c @@ -56,7 +56,7 @@ static int decode_tree_entry_raw(struct object_id *oid, const char **path, return -1; *len = strlen(*path) + 1; - oidread_algop(oid, (const unsigned char *)*path + *len, algo); + oidread(oid, (const unsigned char *)*path + *len, algo); return 0; } diff --git a/object-file.c b/object-file.c index a40300ce4a..c161e3e2a5 100644 --- a/object-file.c +++ b/object-file.c @@ -1446,7 +1446,7 @@ static int loose_object_info(struct repository *r, int allow_unknown = flags & OBJECT_INFO_ALLOW_UNKNOWN_TYPE; if (oi->delta_base_oid) - oidclr(oi->delta_base_oid); + oidclr(oi->delta_base_oid, the_repository->hash_algo); /* * If we don't care about type or size, then we don't @@ -1580,7 +1580,7 @@ static int do_oid_object_info_extended(struct repository *r, if (oi->disk_sizep) *(oi->disk_sizep) = 0; if (oi->delta_base_oid) - oidclr(oi->delta_base_oid); + oidclr(oi->delta_base_oid, the_repository->hash_algo); if (oi->type_name) strbuf_addstr(oi->type_name, type_name(co->type)); if (oi->contentp) diff --git a/packfile.c b/packfile.c index 9156e9122c..ec7312cd20 100644 --- a/packfile.c +++ b/packfile.c @@ -1251,7 +1251,7 @@ static int get_delta_base_oid(struct packed_git *p, { if (type == OBJ_REF_DELTA) { unsigned char *base = use_pack(p, w_curs, curpos, NULL); - oidread(oid, base); + oidread(oid, base, the_repository->hash_algo); return 0; } else if (type == OBJ_OFS_DELTA) { uint32_t base_pos; @@ -1593,7 +1593,7 @@ int packed_object_info(struct repository *r, struct packed_git *p, goto out; } } else - oidclr(oi->delta_base_oid); + oidclr(oi->delta_base_oid, the_repository->hash_algo); } oi->whence = in_delta_base_cache(p, obj_offset) ? OI_DBCACHED : @@ -1917,10 +1917,12 @@ int nth_packed_object_id(struct object_id *oid, return -1; index += 4 * 256; if (p->index_version == 1) { - oidread(oid, index + st_add(st_mult(hashsz + 4, n), 4)); + oidread(oid, index + st_add(st_mult(hashsz + 4, n), 4), + the_repository->hash_algo); } else { index += 8; - oidread(oid, index + st_mult(hashsz, n)); + oidread(oid, index + st_mult(hashsz, n), + the_repository->hash_algo); } return 0; } diff --git a/read-cache.c b/read-cache.c index 2642ac9558..836f1db721 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1728,7 +1728,7 @@ static int verify_hdr(const struct cache_header *hdr, unsigned long size) end = (unsigned char *)hdr + size; start = end - the_hash_algo->rawsz; - oidread(&oid, start); + oidread(&oid, start, the_repository->hash_algo); if (oideq(&oid, null_oid())) return 0; @@ -1876,7 +1876,8 @@ static struct cache_entry *create_from_disk(struct mem_pool *ce_mem_pool, ce->ce_flags = flags & ~CE_NAMEMASK; ce->ce_namelen = len; ce->index = 0; - oidread(&ce->oid, (const unsigned char *)ondisk + offsetof(struct ondisk_cache_entry, data)); + oidread(&ce->oid, (const unsigned char *)ondisk + offsetof(struct ondisk_cache_entry, data), + the_repository->hash_algo); if (expand_name_field) { if (copy_len) @@ -2249,7 +2250,8 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist) if (verify_hdr(hdr, mmap_size) < 0) goto unmap; - oidread(&istate->oid, (const unsigned char *)hdr + mmap_size - the_hash_algo->rawsz); + oidread(&istate->oid, (const unsigned char *)hdr + mmap_size - the_hash_algo->rawsz, + the_repository->hash_algo); istate->version = ntohl(hdr->hdr_version); istate->cache_nr = ntohl(hdr->hdr_entries); istate->cache_alloc = alloc_nr(istate->cache_nr); diff --git a/refs.c b/refs.c index 1304d3dd87..6e7caefdcf 100644 --- a/refs.c +++ b/refs.c @@ -1822,7 +1822,7 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs, failure_errno != ENOTDIR) return NULL; - oidclr(oid); + oidclr(oid, the_repository->hash_algo); if (*flags & REF_BAD_NAME) *flags |= REF_ISBROKEN; return refname; @@ -1832,7 +1832,7 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs, if (!(read_flags & REF_ISSYMREF)) { if (*flags & REF_BAD_NAME) { - oidclr(oid); + oidclr(oid, the_repository->hash_algo); *flags |= REF_ISBROKEN; } return refname; @@ -1840,7 +1840,7 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs, refname = sb_refname.buf; if (resolve_flags & RESOLVE_REF_NO_RECURSE) { - oidclr(oid); + oidclr(oid, the_repository->hash_algo); return refname; } if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) { diff --git a/refs/files-backend.c b/refs/files-backend.c index 4519b46171..b484b5880d 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -246,7 +246,7 @@ static void loose_fill_ref_dir_regular_file(struct files_ref_store *refs, if (!refs_resolve_ref_unsafe(&refs->base, refname, RESOLVE_REF_READING, &oid, &flag)) { - oidclr(&oid); + oidclr(&oid, the_repository->hash_algo); flag |= REF_ISBROKEN; } else if (is_null_oid(&oid)) { /* @@ -263,7 +263,7 @@ static void loose_fill_ref_dir_regular_file(struct files_ref_store *refs, if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) { if (!refname_is_safe(refname)) die("loose refname is dangerous: %s", refname); - oidclr(&oid); + oidclr(&oid, the_repository->hash_algo); flag |= REF_BAD_NAME | REF_ISBROKEN; } add_entry_to_dir(dir, create_ref_entry(refname, &oid, flag)); @@ -1150,7 +1150,7 @@ static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs, if (!refs_resolve_ref_unsafe(&refs->base, lock->ref_name, 0, &lock->old_oid, NULL)) - oidclr(&lock->old_oid); + oidclr(&lock->old_oid, the_repository->hash_algo); goto out; error_return: diff --git a/refs/packed-backend.c b/refs/packed-backend.c index c4c1e36aa2..5ab1b21d10 100644 --- a/refs/packed-backend.c +++ b/refs/packed-backend.c @@ -894,7 +894,7 @@ static int next_record(struct packed_ref_iterator *iter) if (!refname_is_safe(iter->base.refname)) die("packed refname is dangerous: %s", iter->base.refname); - oidclr(&iter->oid); + oidclr(&iter->oid, the_repository->hash_algo); iter->base.flags |= REF_BAD_NAME | REF_ISBROKEN; } if (iter->snapshot->peeled == PEELED_FULLY || @@ -919,13 +919,13 @@ static int next_record(struct packed_ref_iterator *iter) * we suppress it if the reference is broken: */ if ((iter->base.flags & REF_ISBROKEN)) { - oidclr(&iter->peeled); + oidclr(&iter->peeled, the_repository->hash_algo); iter->base.flags &= ~REF_KNOWS_PEELED; } else { iter->base.flags |= REF_KNOWS_PEELED; } } else { - oidclr(&iter->peeled); + oidclr(&iter->peeled, the_repository->hash_algo); } return ITER_OK; diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c index 9886fc67a4..57df2aba66 100644 --- a/refs/reftable-backend.c +++ b/refs/reftable-backend.c @@ -217,7 +217,8 @@ static int read_ref_without_reload(struct reftable_stack *stack, strbuf_addstr(referent, ref.value.symref); *type |= REF_ISSYMREF; } else if (reftable_ref_record_val1(&ref)) { - oidread(oid, reftable_ref_record_val1(&ref)); + oidread(oid, reftable_ref_record_val1(&ref), + the_repository->hash_algo); } else { /* We got a tombstone, which should not happen. */ BUG("unhandled reference value type %d", ref.value_type); @@ -483,15 +484,17 @@ static int reftable_ref_iterator_advance(struct ref_iterator *ref_iterator) switch (iter->ref.value_type) { case REFTABLE_REF_VAL1: - oidread(&iter->oid, iter->ref.value.val1); + oidread(&iter->oid, iter->ref.value.val1, + the_repository->hash_algo); break; case REFTABLE_REF_VAL2: - oidread(&iter->oid, iter->ref.value.val2.value); + oidread(&iter->oid, iter->ref.value.val2.value, + the_repository->hash_algo); break; case REFTABLE_REF_SYMREF: if (!refs_resolve_ref_unsafe(&iter->refs->base, iter->ref.refname, RESOLVE_REF_READING, &iter->oid, &flags)) - oidclr(&iter->oid); + oidclr(&iter->oid, the_repository->hash_algo); break; default: BUG("unhandled reference value type %d", iter->ref.value_type); @@ -503,7 +506,7 @@ static int reftable_ref_iterator_advance(struct ref_iterator *ref_iterator) if (check_refname_format(iter->ref.refname, REFNAME_ALLOW_ONELEVEL)) { if (!refname_is_safe(iter->ref.refname)) die(_("refname is dangerous: %s"), iter->ref.refname); - oidclr(&iter->oid); + oidclr(&iter->oid, the_repository->hash_algo); flags |= REF_BAD_NAME | REF_ISBROKEN; } @@ -545,7 +548,8 @@ static int reftable_ref_iterator_peel(struct ref_iterator *ref_iterator, (struct reftable_ref_iterator *)ref_iterator; if (iter->ref.value_type == REFTABLE_REF_VAL2) { - oidread(peeled, iter->ref.value.val2.target_value); + oidread(peeled, iter->ref.value.val2.target_value, + the_repository->hash_algo); return 0; } @@ -1776,8 +1780,8 @@ static int yield_log_record(struct reftable_log_record *log, struct object_id old_oid, new_oid; const char *full_committer; - oidread(&old_oid, log->value.update.old_hash); - oidread(&new_oid, log->value.update.new_hash); + oidread(&old_oid, log->value.update.old_hash, the_repository->hash_algo); + oidread(&new_oid, log->value.update.new_hash, the_repository->hash_algo); /* * When both the old object ID and the new object ID are null @@ -2178,7 +2182,8 @@ static int reftable_be_reflog_expire(struct ref_store *ref_store, if (ret < 0) goto done; if (reftable_ref_record_val1(&ref_record)) - oidread(&oid, reftable_ref_record_val1(&ref_record)); + oidread(&oid, reftable_ref_record_val1(&ref_record), + the_repository->hash_algo); prepare_fn(refname, &oid, policy_cb_data); while (1) { @@ -2193,8 +2198,10 @@ static int reftable_be_reflog_expire(struct ref_store *ref_store, break; } - oidread(&old_oid, log.value.update.old_hash); - oidread(&new_oid, log.value.update.new_hash); + oidread(&old_oid, log.value.update.old_hash, + the_repository->hash_algo); + oidread(&new_oid, log.value.update.new_hash, + the_repository->hash_algo); /* * Skip over the reflog existence marker. We will add it back @@ -2225,8 +2232,10 @@ static int reftable_be_reflog_expire(struct ref_store *ref_store, struct object_id old_oid, new_oid; *dest = logs[i]; - oidread(&old_oid, logs[i].value.update.old_hash); - oidread(&new_oid, logs[i].value.update.new_hash); + oidread(&old_oid, logs[i].value.update.old_hash, + the_repository->hash_algo); + oidread(&new_oid, logs[i].value.update.new_hash, + the_repository->hash_algo); if (should_prune_fn(&old_oid, &new_oid, logs[i].value.update.email, (timestamp_t)logs[i].value.update.time, @@ -2243,7 +2252,7 @@ static int reftable_be_reflog_expire(struct ref_store *ref_store, if (flags & EXPIRE_REFLOGS_UPDATE_REF && last_hash && reftable_ref_record_val1(&ref_record)) - oidread(&arg.update_oid, last_hash); + oidread(&arg.update_oid, last_hash, the_repository->hash_algo); arg.refs = refs; arg.records = rewritten; diff --git a/remote.c b/remote.c index dcb5492c85..1064171085 100644 --- a/remote.c +++ b/remote.c @@ -1164,7 +1164,7 @@ static void tail_link_ref(struct ref *ref, struct ref ***tail) static struct ref *alloc_delete_ref(void) { struct ref *ref = alloc_ref("(delete)"); - oidclr(&ref->new_oid); + oidclr(&ref->new_oid, the_repository->hash_algo); return ref; } @@ -2531,7 +2531,7 @@ static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, i if (!*colon) entry->use_tracking = 1; else if (!colon[1]) - oidclr(&entry->expect); + oidclr(&entry->expect, the_repository->hash_algo); else if (repo_get_oid(the_repository, colon + 1, &entry->expect)) return error(_("cannot parse expected object name '%s'"), colon + 1); @@ -2733,7 +2733,7 @@ static void apply_cas(struct push_cas_option *cas, else if (remote_tracking(remote, ref->name, &ref->old_oid_expect, &ref->tracking_ref)) - oidclr(&ref->old_oid_expect); + oidclr(&ref->old_oid_expect, the_repository->hash_algo); else ref->check_reachable = cas->use_force_if_includes; return; @@ -2747,7 +2747,7 @@ static void apply_cas(struct push_cas_option *cas, if (remote_tracking(remote, ref->name, &ref->old_oid_expect, &ref->tracking_ref)) - oidclr(&ref->old_oid_expect); + oidclr(&ref->old_oid_expect, the_repository->hash_algo); else ref->check_reachable = cas->use_force_if_includes; } diff --git a/resolve-undo.c b/resolve-undo.c index cd02dc9928..4e6f0e4676 100644 --- a/resolve-undo.c +++ b/resolve-undo.c @@ -93,7 +93,8 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size) continue; if (size < rawsz) goto error; - oidread(&ui->oid[i], (const unsigned char *)data); + oidread(&ui->oid[i], (const unsigned char *)data, + the_repository->hash_algo); size -= rawsz; data += rawsz; } diff --git a/sequencer.c b/sequencer.c index 30513e87bf..68d62a12ff 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3334,12 +3334,12 @@ static int rollback_is_safe(void) strbuf_release(&sb); } else if (errno == ENOENT) - oidclr(&expected_head); + oidclr(&expected_head, the_repository->hash_algo); else die_errno(_("could not read '%s'"), git_path_abort_safety_file()); if (repo_get_oid(the_repository, "HEAD", &actual_head)) - oidclr(&actual_head); + oidclr(&actual_head, the_repository->hash_algo); return oideq(&actual_head, &expected_head); } diff --git a/split-index.c b/split-index.c index 8c38687c04..058a8f448e 100644 --- a/split-index.c +++ b/split-index.c @@ -29,7 +29,7 @@ int read_link_extension(struct index_state *istate, if (sz < the_hash_algo->rawsz) return error("corrupt link extension (too short)"); si = init_split_index(istate); - oidread(&si->base_oid, data); + oidread(&si->base_oid, data, the_repository->hash_algo); data += the_hash_algo->rawsz; sz -= the_hash_algo->rawsz; if (!sz) diff --git a/submodule-config.c b/submodule-config.c index ec45ea67b9..ad43a282da 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -682,7 +682,7 @@ static int gitmodule_oid_from_commit(const struct object_id *treeish_name, int ret = 0; if (is_null_oid(treeish_name)) { - oidclr(gitmodules_oid); + oidclr(gitmodules_oid, the_repository->hash_algo); return 1; } diff --git a/t/helper/test-submodule-config.c b/t/helper/test-submodule-config.c index 9df2f03ac8..4b809d9dca 100644 --- a/t/helper/test-submodule-config.c +++ b/t/helper/test-submodule-config.c @@ -44,7 +44,7 @@ int cmd__submodule_config(int argc, const char **argv) path_or_name = arg[1]; if (commit[0] == '\0') - oidclr(&commit_oid); + oidclr(&commit_oid, the_repository->hash_algo); else if (repo_get_oid(the_repository, commit, &commit_oid) < 0) die_usage(argc, argv, "Commit not found."); diff --git a/tree-walk.c b/tree-walk.c index 6565d9ad99..535a3a2539 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -38,8 +38,8 @@ static int decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned l desc->entry.path = path; desc->entry.mode = (desc->flags & TREE_DESC_RAW_MODES) ? mode : canon_mode(mode); desc->entry.pathlen = len - 1; - oidread_algop(&desc->entry.oid, (const unsigned char *)path + len, - desc->algo); + oidread(&desc->entry.oid, (const unsigned char *)path + len, + desc->algo); return 0; } -- cgit v1.2.3 From e7da9385708accf518a80a1e17969020fb361048 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 14 Jun 2024 08:50:23 +0200 Subject: global: introduce `USE_THE_REPOSITORY_VARIABLE` macro Use of the `the_repository` variable is deprecated nowadays, and we slowly but steadily convert the codebase to not use it anymore. Instead, callers should be passing down the repository to work on via parameters. It is hard though to prove that a given code unit does not use this variable anymore. The most trivial case, merely demonstrating that there is no direct use of `the_repository`, is already a bit of a pain during code reviews as the reviewer needs to manually verify claims made by the patch author. The bigger problem though is that we have many interfaces that implicitly rely on `the_repository`. Introduce a new `USE_THE_REPOSITORY_VARIABLE` macro that allows code units to opt into usage of `the_repository`. The intent of this macro is to demonstrate that a certain code unit does not use this variable anymore, and to keep it from new dependencies on it in future changes, be it explicit or implicit For now, the macro only guards `the_repository` itself as well as `the_hash_algo`. There are many more known interfaces where we have an implicit dependency on `the_repository`, but those are not guarded at the current point in time. Over time though, we should start to add guards as required (or even better, just remove them). Define the macro as required in our code units. As expected, most of our code still relies on the global variable. Nearly all of our builtins rely on the variable as there is no way yet to pass `the_repository` to their entry point. For now, declare the macro in "biultin.h" to keep the required changes at least a little bit more contained. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- add-interactive.c | 2 ++ add-patch.c | 2 ++ apply.c | 2 ++ archive-tar.c | 3 +++ archive-zip.c | 3 +++ archive.c | 2 ++ attr.c | 2 ++ bisect.c | 2 ++ blame.c | 2 ++ branch.c | 2 ++ builtin.h | 8 ++++++++ builtin/blame.c | 2 +- builtin/log.c | 2 +- bulk-checkin.c | 3 +++ bundle-uri.c | 2 ++ bundle.c | 2 ++ cache-tree.c | 2 ++ checkout.c | 2 ++ chunk-format.c | 2 ++ combine-diff.c | 2 ++ commit-graph.c | 2 ++ commit-reach.c | 2 ++ commit.c | 2 ++ common-main.c | 2 ++ compat/win32/trace2_win32_process_info.c | 2 ++ config.c | 3 +++ connected.c | 2 ++ convert.c | 2 ++ csum-file.c | 3 +++ delta-islands.c | 2 ++ diagnose.c | 2 ++ diff-lib.c | 3 +++ diff.c | 3 +++ diffcore-break.c | 3 +++ diffcore-rename.c | 3 +++ dir.c | 3 +++ entry.c | 2 ++ environment.c | 3 +++ fetch-pack.c | 2 ++ fmt-merge-msg.c | 2 ++ fsck.c | 2 ++ fsmonitor-ipc.c | 2 ++ git.c | 2 ++ hash-lookup.c | 2 ++ hash.h | 4 +++- help.c | 2 ++ hex.c | 2 ++ http-backend.c | 2 ++ http-push.c | 2 ++ http-walker.c | 2 ++ http.c | 2 ++ list-objects-filter-options.c | 2 ++ list-objects-filter.c | 2 ++ list-objects.c | 2 ++ log-tree.c | 2 ++ loose.c | 2 ++ ls-refs.c | 2 ++ mailmap.c | 2 ++ match-trees.c | 2 ++ merge-blobs.c | 2 ++ merge-ort.c | 2 ++ merge-recursive.c | 3 +++ merge.c | 2 ++ midx-write.c | 2 ++ midx.c | 2 ++ negotiator/default.c | 2 ++ negotiator/skipping.c | 2 ++ notes-cache.c | 2 ++ notes-merge.c | 2 ++ notes-utils.c | 2 ++ notes.c | 2 ++ object-file-convert.c | 2 ++ object-file.c | 3 +++ object-name.c | 2 ++ object.c | 2 ++ oid-array.c | 2 ++ oss-fuzz/fuzz-commit-graph.c | 2 ++ pack-bitmap-write.c | 2 ++ pack-bitmap.c | 2 ++ pack-check.c | 2 ++ pack-revindex.c | 2 ++ pack-write.c | 2 ++ packfile.c | 2 ++ parse-options-cb.c | 2 ++ path.c | 3 +++ pathspec.c | 2 ++ pretty.c | 2 ++ progress.c | 2 ++ promisor-remote.c | 2 ++ range-diff.c | 2 ++ reachable.c | 2 ++ read-cache.c | 3 +++ rebase-interactive.c | 2 ++ ref-filter.c | 2 ++ reflog-walk.c | 2 ++ reflog.c | 2 ++ refs.c | 2 ++ refs/files-backend.c | 2 ++ refs/packed-backend.c | 2 ++ refs/reftable-backend.c | 2 ++ refspec.c | 2 ++ remote-curl.c | 2 ++ remote.c | 2 ++ repository.c | 8 ++++++++ repository.h | 2 ++ rerere.c | 2 ++ reset.c | 2 ++ resolve-undo.c | 2 ++ revision.c | 2 ++ run-command.c | 2 ++ scalar.c | 2 ++ send-pack.c | 2 ++ sequencer.c | 2 ++ serve.c | 2 ++ server-info.c | 2 ++ setup.c | 2 ++ shallow.c | 2 ++ split-index.c | 2 ++ streaming.c | 3 +++ submodule-config.c | 2 ++ submodule.c | 2 ++ t/helper/test-bitmap.c | 2 ++ t/helper/test-bloom.c | 2 ++ t/helper/test-cache-tree.c | 2 ++ t/helper/test-dump-cache-tree.c | 2 ++ t/helper/test-dump-fsmonitor.c | 2 ++ t/helper/test-dump-split-index.c | 2 ++ t/helper/test-dump-untracked-cache.c | 2 ++ t/helper/test-find-pack.c | 2 ++ t/helper/test-fsmonitor-client.c | 2 ++ t/helper/test-lazy-init-name-hash.c | 2 ++ t/helper/test-match-trees.c | 2 ++ t/helper/test-oidmap.c | 2 ++ t/helper/test-pack-mtimes.c | 2 ++ t/helper/test-reach.c | 2 ++ t/helper/test-read-cache.c | 2 ++ t/helper/test-read-graph.c | 2 ++ t/helper/test-read-midx.c | 2 ++ t/helper/test-ref-store.c | 2 ++ t/helper/test-repository.c | 2 ++ t/helper/test-revision-walking.c | 2 ++ t/helper/test-scrap-cache-tree.c | 2 ++ t/helper/test-submodule-config.c | 2 ++ t/helper/test-submodule-nested-repo-config.c | 2 ++ t/helper/test-submodule.c | 2 ++ t/helper/test-trace2.c | 2 ++ t/helper/test-write-cache.c | 2 ++ t/unit-tests/t-example-decorate.c | 2 ++ tag.c | 2 ++ tmp-objdir.c | 2 ++ transport-helper.c | 2 ++ transport.c | 2 ++ tree-walk.c | 2 ++ tree.c | 2 ++ unpack-trees.c | 2 ++ upload-pack.c | 2 ++ walker.c | 2 ++ worktree.c | 2 ++ wt-status.c | 2 ++ xdiff-interface.c | 2 ++ 160 files changed, 347 insertions(+), 3 deletions(-) (limited to 'commit-graph.c') diff --git a/add-interactive.c b/add-interactive.c index a0961096cd..49042b3026 100644 --- a/add-interactive.c +++ b/add-interactive.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "add-interactive.h" #include "color.h" diff --git a/add-patch.c b/add-patch.c index 86181770f2..99e037c1e2 100644 --- a/add-patch.c +++ b/add-patch.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "add-interactive.h" #include "advice.h" diff --git a/apply.c b/apply.c index 528939abb6..ff939f908a 100644 --- a/apply.c +++ b/apply.c @@ -7,6 +7,8 @@ * */ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "base85.h" diff --git a/archive-tar.c b/archive-tar.c index 8ae30125f8..e7b3489e1e 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -1,6 +1,9 @@ /* * Copyright (c) 2005, 2006 Rene Scharfe */ + +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "gettext.h" diff --git a/archive-zip.c b/archive-zip.c index fd1d3f816d..9f32730181 100644 --- a/archive-zip.c +++ b/archive-zip.c @@ -1,6 +1,9 @@ /* * Copyright (c) 2006 Rene Scharfe */ + +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "archive.h" diff --git a/archive.c b/archive.c index 5287fcdd8e..7bd60d0632 100644 --- a/archive.c +++ b/archive.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "config.h" diff --git a/attr.c b/attr.c index 300f994ba6..b5ed83c90e 100644 --- a/attr.c +++ b/attr.c @@ -6,6 +6,8 @@ * an insanely large number of attributes. */ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "environment.h" diff --git a/bisect.c b/bisect.c index 4ea703bec1..135f94ba09 100644 --- a/bisect.c +++ b/bisect.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "commit.h" diff --git a/blame.c b/blame.c index a80f5e2e61..d403c46a35 100644 --- a/blame.c +++ b/blame.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "refs.h" #include "object-store-ll.h" diff --git a/branch.c b/branch.c index df5d24fec6..c887ea2151 100644 --- a/branch.c +++ b/branch.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "advice.h" #include "config.h" diff --git a/builtin.h b/builtin.h index 7eda9b2486..14fa017160 100644 --- a/builtin.h +++ b/builtin.h @@ -1,6 +1,14 @@ #ifndef BUILTIN_H #define BUILTIN_H +/* + * TODO: Almost all of our builtins access `the_repository` by necessity + * because they do not get passed a pointer to it. We should adapt the function + * signature of those main functions to accept a `struct repository *` and then + * remove the macro here. + */ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" /* diff --git a/builtin/blame.c b/builtin/blame.c index e09ff0155a..de89fff3f8 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -5,7 +5,7 @@ * See COPYING for licensing conditions */ -#include "git-compat-util.h" +#include "builtin.h" #include "config.h" #include "color.h" #include "builtin.h" diff --git a/builtin/log.c b/builtin/log.c index ccbda8a005..00305bea51 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -4,7 +4,7 @@ * (C) Copyright 2006 Linus Torvalds * 2006 Junio Hamano */ -#include "git-compat-util.h" +#include "builtin.h" #include "abspath.h" #include "config.h" #include "environment.h" diff --git a/bulk-checkin.c b/bulk-checkin.c index eb46b88637..da8673199b 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -1,6 +1,9 @@ /* * Copyright (c) 2011, Google Inc. */ + +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "bulk-checkin.h" #include "environment.h" diff --git a/bundle-uri.c b/bundle-uri.c index 91b3319a5c..804fbcfbfa 100644 --- a/bundle-uri.c +++ b/bundle-uri.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "bundle-uri.h" #include "bundle.h" diff --git a/bundle.c b/bundle.c index 95367c2d0a..82c285b905 100644 --- a/bundle.c +++ b/bundle.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "lockfile.h" #include "bundle.h" diff --git a/cache-tree.c b/cache-tree.c index 3290a1b8dd..50610c3f3c 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "environment.h" #include "hex.h" diff --git a/checkout.c b/checkout.c index cfaea4bd10..0b1cf8b40b 100644 --- a/checkout.c +++ b/checkout.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "object-name.h" #include "remote.h" diff --git a/chunk-format.c b/chunk-format.c index cdc7f39b70..2dde24e6a3 100644 --- a/chunk-format.c +++ b/chunk-format.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "chunk-format.h" #include "csum-file.h" diff --git a/combine-diff.c b/combine-diff.c index 4960d904ac..829a44e416 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "object-store-ll.h" #include "commit.h" diff --git a/commit-graph.c b/commit-graph.c index 98cbd53eea..e1070ee6e7 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "csum-file.h" diff --git a/commit-reach.c b/commit-reach.c index 384aee1ab3..dabc2972e4 100644 --- a/commit-reach.c +++ b/commit-reach.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "commit.h" #include "commit-graph.h" diff --git a/commit.c b/commit.c index 1d08951007..4956803e11 100644 --- a/commit.c +++ b/commit.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "tag.h" #include "commit.h" diff --git a/common-main.c b/common-main.c index b86f40600f..8e68ac9e42 100644 --- a/common-main.c +++ b/common-main.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "exec-cmd.h" #include "gettext.h" diff --git a/compat/win32/trace2_win32_process_info.c b/compat/win32/trace2_win32_process_info.c index 3ef0936f6f..f147da706a 100644 --- a/compat/win32/trace2_win32_process_info.c +++ b/compat/win32/trace2_win32_process_info.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "../../git-compat-util.h" #include "../../json-writer.h" #include "../../repository.h" diff --git a/config.c b/config.c index abce05b774..7951029644 100644 --- a/config.c +++ b/config.c @@ -5,6 +5,9 @@ * Copyright (C) Johannes Schindelin, 2005 * */ + +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "advice.h" diff --git a/connected.c b/connected.c index 8f89376dbc..87cc4b57a1 100644 --- a/connected.c +++ b/connected.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "gettext.h" #include "hex.h" diff --git a/convert.c b/convert.c index f2b9f01354..d8737fe0f2 100644 --- a/convert.c +++ b/convert.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "advice.h" #include "config.h" diff --git a/csum-file.c b/csum-file.c index f4be0804b7..8abbf01325 100644 --- a/csum-file.c +++ b/csum-file.c @@ -7,6 +7,9 @@ * files. Useful when you write a file that you want to be * able to verify hasn't been messed with afterwards. */ + +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "progress.h" #include "csum-file.h" diff --git a/delta-islands.c b/delta-islands.c index 89d51b72e3..ffe1ca2814 100644 --- a/delta-islands.c +++ b/delta-islands.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "object.h" #include "commit.h" diff --git a/diagnose.c b/diagnose.c index 4d096c857f..cc2d535b60 100644 --- a/diagnose.c +++ b/diagnose.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "diagnose.h" #include "compat/disk.h" diff --git a/diff-lib.c b/diff-lib.c index 3fb8d79fef..b0d0f711e8 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -1,6 +1,9 @@ /* * Copyright (C) 2005 Junio C Hamano */ + +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "commit.h" #include "diff.h" diff --git a/diff.c b/diff.c index 60d1f7be81..d4579d5f76 100644 --- a/diff.c +++ b/diff.c @@ -1,6 +1,9 @@ /* * Copyright (C) 2005 Junio C Hamano */ + +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "base85.h" diff --git a/diffcore-break.c b/diffcore-break.c index 49ba38aa7c..831b66b5c3 100644 --- a/diffcore-break.c +++ b/diffcore-break.c @@ -1,6 +1,9 @@ /* * Copyright (C) 2005 Junio C Hamano */ + +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "diffcore.h" #include "hash.h" diff --git a/diffcore-rename.c b/diffcore-rename.c index 5abb958651..ae504007cf 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -2,6 +2,9 @@ * * Copyright (C) 2005 Junio C Hamano */ + +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "diff.h" #include "diffcore.h" diff --git a/dir.c b/dir.c index 5de421c29c..b7a6625ebd 100644 --- a/dir.c +++ b/dir.c @@ -5,6 +5,9 @@ * Copyright (C) Linus Torvalds, 2005-2006 * Junio Hamano, 2005-2006 */ + +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "config.h" diff --git a/entry.c b/entry.c index b8c257f6f9..fe1f74d140 100644 --- a/entry.c +++ b/entry.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "object-store-ll.h" #include "dir.h" diff --git a/environment.c b/environment.c index 701d515135..5cea2c9f54 100644 --- a/environment.c +++ b/environment.c @@ -7,6 +7,9 @@ * even if you might want to know where the git directory etc * are. */ + +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "branch.h" diff --git a/fetch-pack.c b/fetch-pack.c index eba9e420ea..e6e14b3874 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "repository.h" #include "config.h" diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index 7d144b803a..b8bca89c0c 100644 --- a/fmt-merge-msg.c +++ b/fmt-merge-msg.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "environment.h" diff --git a/fsck.c b/fsck.c index dd0a33028e..432996cbb6 100644 --- a/fsck.c +++ b/fsck.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "date.h" #include "dir.h" diff --git a/fsmonitor-ipc.c b/fsmonitor-ipc.c index 45471b5b74..f1b1631111 100644 --- a/fsmonitor-ipc.c +++ b/fsmonitor-ipc.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "gettext.h" #include "simple-ipc.h" diff --git a/git.c b/git.c index 683bb69194..e35af9b0e5 100644 --- a/git.c +++ b/git.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "builtin.h" #include "config.h" #include "environment.h" diff --git a/hash-lookup.c b/hash-lookup.c index 9aa6b82eb7..5f808caa51 100644 --- a/hash-lookup.c +++ b/hash-lookup.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "hash.h" #include "hash-lookup.h" diff --git a/hash.h b/hash.h index 39a0164be3..cb85d26a2f 100644 --- a/hash.h +++ b/hash.h @@ -4,6 +4,8 @@ #include "hash-ll.h" #include "repository.h" -#define the_hash_algo the_repository->hash_algo +#ifdef USE_THE_REPOSITORY_VARIABLE +# define the_hash_algo the_repository->hash_algo +#endif #endif diff --git a/help.c b/help.c index 1d057aa607..10fdb1a03d 100644 --- a/help.c +++ b/help.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "builtin.h" diff --git a/hex.c b/hex.c index bc9e86a978..5ca78a7744 100644 --- a/hex.c +++ b/hex.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "hash.h" #include "hex.h" diff --git a/http-backend.c b/http-backend.c index 5b65287ac9..7c0b3be968 100644 --- a/http-backend.c +++ b/http-backend.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "environment.h" diff --git a/http-push.c b/http-push.c index a97df4a1fb..7315a694aa 100644 --- a/http-push.c +++ b/http-push.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "environment.h" #include "hex.h" diff --git a/http-walker.c b/http-walker.c index b7110b6f82..e417a7f51c 100644 --- a/http-walker.c +++ b/http-walker.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "repository.h" #include "hex.h" diff --git a/http.c b/http.c index 67cc47d28f..6536816e81 100644 --- a/http.c +++ b/http.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "git-curl-compat.h" #include "hex.h" diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c index c5f363ca6f..00611107d2 100644 --- a/list-objects-filter-options.c +++ b/list-objects-filter-options.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "gettext.h" diff --git a/list-objects-filter.c b/list-objects-filter.c index 4346f8da45..49e2fa6f97 100644 --- a/list-objects-filter.c +++ b/list-objects-filter.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "dir.h" #include "gettext.h" diff --git a/list-objects.c b/list-objects.c index 11ad8be411..985d008799 100644 --- a/list-objects.c +++ b/list-objects.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "tag.h" #include "commit.h" diff --git a/log-tree.c b/log-tree.c index 41416de4e3..223a4d9463 100644 --- a/log-tree.c +++ b/log-tree.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "commit-reach.h" #include "config.h" diff --git a/loose.c b/loose.c index f6faa6216a..a8bf772172 100644 --- a/loose.c +++ b/loose.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "hash.h" #include "path.h" diff --git a/ls-refs.c b/ls-refs.c index 398afe4ce3..2dd925b43d 100644 --- a/ls-refs.c +++ b/ls-refs.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "environment.h" #include "gettext.h" diff --git a/mailmap.c b/mailmap.c index b2efe29b3d..534a3eb4f0 100644 --- a/mailmap.c +++ b/mailmap.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "environment.h" #include "string-list.h" diff --git a/match-trees.c b/match-trees.c index 50c42e2061..f17c74d483 100644 --- a/match-trees.c +++ b/match-trees.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "hex.h" #include "match-trees.h" diff --git a/merge-blobs.c b/merge-blobs.c index 2f659fd014..0ad0390fea 100644 --- a/merge-blobs.c +++ b/merge-blobs.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "merge-ll.h" #include "blob.h" diff --git a/merge-ort.c b/merge-ort.c index eaede6cead..691db9050e 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -14,6 +14,8 @@ * "cale", "peedy", or "ins" instead of "ort"?) */ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "merge-ort.h" diff --git a/merge-recursive.c b/merge-recursive.c index 8ff29ed09e..46ee364af7 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3,6 +3,9 @@ * Fredrik Kuivinen. * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006 */ + +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "merge-recursive.h" diff --git a/merge.c b/merge.c index 752a937fa9..fe3efa4b24 100644 --- a/merge.c +++ b/merge.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "gettext.h" #include "hash.h" diff --git a/midx-write.c b/midx-write.c index 55a6b63bac..9a194e8aac 100644 --- a/midx-write.c +++ b/midx-write.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "config.h" diff --git a/midx.c b/midx.c index 1e75f1a7eb..3992b05465 100644 --- a/midx.c +++ b/midx.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "dir.h" diff --git a/negotiator/default.c b/negotiator/default.c index 518b3c43b2..e3fa5c3324 100644 --- a/negotiator/default.c +++ b/negotiator/default.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "default.h" #include "../commit.h" diff --git a/negotiator/skipping.c b/negotiator/skipping.c index b7e008c2fd..f109928ad0 100644 --- a/negotiator/skipping.c +++ b/negotiator/skipping.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "skipping.h" #include "../commit.h" diff --git a/notes-cache.c b/notes-cache.c index 038db01ca0..ecfdf6e43b 100644 --- a/notes-cache.c +++ b/notes-cache.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "notes-cache.h" #include "object-store-ll.h" diff --git a/notes-merge.c b/notes-merge.c index 801941c2d1..d95e683414 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "advice.h" #include "commit.h" diff --git a/notes-utils.c b/notes-utils.c index e33aa86c4b..bca71274be 100644 --- a/notes-utils.c +++ b/notes-utils.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "commit.h" diff --git a/notes.c b/notes.c index afe2e2882e..b6a13d0980 100644 --- a/notes.c +++ b/notes.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "environment.h" diff --git a/object-file-convert.c b/object-file-convert.c index f684038f7f..958f61f094 100644 --- a/object-file-convert.c +++ b/object-file-convert.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "gettext.h" #include "strbuf.h" diff --git a/object-file.c b/object-file.c index 72318c8dd4..a6555ed68c 100644 --- a/object-file.c +++ b/object-file.c @@ -6,6 +6,9 @@ * This handles basic git object files - packing, unpacking, * creation etc. */ + +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "config.h" diff --git a/object-name.c b/object-name.c index 523af6f64f..d7509514bc 100644 --- a/object-name.c +++ b/object-name.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "object-name.h" #include "advice.h" diff --git a/object.c b/object.c index 93b5d97fdb..0c0fcb76c0 100644 --- a/object.c +++ b/object.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "gettext.h" #include "hex.h" diff --git a/oid-array.c b/oid-array.c index 1f36651754..9cac974395 100644 --- a/oid-array.c +++ b/oid-array.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "oid-array.h" #include "hash-lookup.h" diff --git a/oss-fuzz/fuzz-commit-graph.c b/oss-fuzz/fuzz-commit-graph.c index 75e668a057..951c9c082f 100644 --- a/oss-fuzz/fuzz-commit-graph.c +++ b/oss-fuzz/fuzz-commit-graph.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "commit-graph.h" #include "repository.h" diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index 59d2e3a387..37a8ad0fb3 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "environment.h" #include "gettext.h" diff --git a/pack-bitmap.c b/pack-bitmap.c index 184d28f05c..7eafdce4ee 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "commit.h" #include "gettext.h" diff --git a/pack-check.c b/pack-check.c index e7b214fcbd..e883dae3f2 100644 --- a/pack-check.c +++ b/pack-check.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "environment.h" #include "hex.h" diff --git a/pack-revindex.c b/pack-revindex.c index fc63aa76a2..de922b47d2 100644 --- a/pack-revindex.c +++ b/pack-revindex.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "gettext.h" #include "pack-revindex.h" diff --git a/pack-write.c b/pack-write.c index eef625fa5b..d07f03d0ab 100644 --- a/pack-write.c +++ b/pack-write.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "environment.h" #include "gettext.h" diff --git a/packfile.c b/packfile.c index ec7312cd20..813584646f 100644 --- a/packfile.c +++ b/packfile.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "environment.h" #include "gettext.h" diff --git a/parse-options-cb.c b/parse-options-cb.c index d99d688d3c..3fb7ce68ca 100644 --- a/parse-options-cb.c +++ b/parse-options-cb.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "parse-options.h" #include "branch.h" diff --git a/path.c b/path.c index adfb3d3eb7..19f7684f38 100644 --- a/path.c +++ b/path.c @@ -1,6 +1,9 @@ /* * Utilities for paths and pathnames */ + +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "environment.h" diff --git a/pathspec.c b/pathspec.c index 2133b9fe60..fe1f0f41af 100644 --- a/pathspec.c +++ b/pathspec.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "parse.h" diff --git a/pretty.c b/pretty.c index 22a81506b7..2c14a88abc 100644 --- a/pretty.c +++ b/pretty.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "commit.h" diff --git a/progress.c b/progress.c index c83cb60bf1..0d44c18edc 100644 --- a/progress.c +++ b/progress.c @@ -9,6 +9,8 @@ */ #define GIT_TEST_PROGRESS_ONLY +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "pager.h" #include "progress.h" diff --git a/promisor-remote.c b/promisor-remote.c index 2ca7c2ae48..317e1b127f 100644 --- a/promisor-remote.c +++ b/promisor-remote.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "gettext.h" #include "hex.h" diff --git a/range-diff.c b/range-diff.c index c45b6d849c..5f01605550 100644 --- a/range-diff.c +++ b/range-diff.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "environment.h" #include "gettext.h" diff --git a/reachable.c b/reachable.c index 1224b30008..46613a6bb6 100644 --- a/reachable.c +++ b/reachable.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "gettext.h" #include "hex.h" diff --git a/read-cache.c b/read-cache.c index 085b22faf3..48bf24f87c 100644 --- a/read-cache.c +++ b/read-cache.c @@ -3,6 +3,9 @@ * * Copyright (C) Linus Torvalds, 2005 */ + +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "bulk-checkin.h" #include "config.h" diff --git a/rebase-interactive.c b/rebase-interactive.c index c343e16fcd..e93b385523 100644 --- a/rebase-interactive.c +++ b/rebase-interactive.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "commit.h" #include "editor.h" diff --git a/ref-filter.c b/ref-filter.c index f7fb0c7e0e..8c5e673fc0 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "environment.h" #include "gettext.h" diff --git a/reflog-walk.c b/reflog-walk.c index 5f09552c5c..c7070b13b0 100644 --- a/reflog-walk.c +++ b/reflog-walk.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "commit.h" #include "refs.h" diff --git a/reflog.c b/reflog.c index 3c80950186..5ca944529b 100644 --- a/reflog.c +++ b/reflog.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "gettext.h" #include "object-store-ll.h" diff --git a/refs.c b/refs.c index 6e7caefdcf..727ed6c1d6 100644 --- a/refs.c +++ b/refs.c @@ -2,6 +2,8 @@ * The backend-independent part of the reference module. */ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "advice.h" #include "config.h" diff --git a/refs/files-backend.c b/refs/files-backend.c index b484b5880d..35931bc71e 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "../git-compat-util.h" #include "../copy.h" #include "../environment.h" diff --git a/refs/packed-backend.c b/refs/packed-backend.c index 5ab1b21d10..a0666407cd 100644 --- a/refs/packed-backend.c +++ b/refs/packed-backend.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "../git-compat-util.h" #include "../config.h" #include "../dir.h" diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c index 57df2aba66..6e34eb2188 100644 --- a/refs/reftable-backend.c +++ b/refs/reftable-backend.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "../git-compat-util.h" #include "../abspath.h" #include "../chdir-notify.h" diff --git a/refspec.c b/refspec.c index d60932f4de..c2e3e24351 100644 --- a/refspec.c +++ b/refspec.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "gettext.h" #include "hash.h" diff --git a/remote-curl.c b/remote-curl.c index 6008d7e87c..1930f83cc7 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "git-curl-compat.h" #include "config.h" diff --git a/remote.c b/remote.c index 1064171085..5fab7f0970 100644 --- a/remote.c +++ b/remote.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "config.h" diff --git a/repository.c b/repository.c index 95d10cc4a0..9825a30899 100644 --- a/repository.c +++ b/repository.c @@ -16,6 +16,14 @@ #include "promisor-remote.h" #include "refs.h" +/* + * We do not define `USE_THE_REPOSITORY_VARIABLE` in this file because we do + * not want to rely on functions that implicitly use `the_repository`. This + * means that the `extern` declaration of `the_repository` isn't visible here, + * which makes sparse unhappy. We thus declare it here. + */ +extern struct repository *the_repository; + /* The main repository */ static struct repository the_repo; struct repository *the_repository = &the_repo; diff --git a/repository.h b/repository.h index a35cd77c35..29727edec6 100644 --- a/repository.h +++ b/repository.h @@ -197,7 +197,9 @@ struct repository { unsigned different_commondir:1; }; +#ifdef USE_THE_REPOSITORY_VARIABLE extern struct repository *the_repository; +#endif /* * Define a custom repository layout. Any field can be NULL, which diff --git a/rerere.c b/rerere.c index c7e1f8fd25..597256fa5b 100644 --- a/rerere.c +++ b/rerere.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "config.h" diff --git a/reset.c b/reset.c index 937f11c0f4..9550dea03d 100644 --- a/reset.c +++ b/reset.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "cache-tree.h" #include "gettext.h" diff --git a/resolve-undo.c b/resolve-undo.c index 4e6f0e4676..8c9911affb 100644 --- a/resolve-undo.c +++ b/resolve-undo.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "dir.h" #include "hash.h" diff --git a/revision.c b/revision.c index 7ddf0f151a..40da255953 100644 --- a/revision.c +++ b/revision.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "environment.h" diff --git a/run-command.c b/run-command.c index 31b20123d8..f5fde92b7c 100644 --- a/run-command.c +++ b/run-command.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "run-command.h" #include "environment.h" diff --git a/scalar.c b/scalar.c index 331b91dbdb..a1cb4b45b5 100644 --- a/scalar.c +++ b/scalar.c @@ -2,6 +2,8 @@ * The Scalar command-line interface. */ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "gettext.h" diff --git a/send-pack.c b/send-pack.c index 37f59d4f66..b42e6986df 100644 --- a/send-pack.c +++ b/send-pack.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "commit.h" diff --git a/sequencer.c b/sequencer.c index 823691e379..8083fe20bf 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "advice.h" diff --git a/serve.c b/serve.c index aa651b73e9..33608ea4d5 100644 --- a/serve.c +++ b/serve.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "repository.h" #include "config.h" diff --git a/server-info.c b/server-info.c index 6feaa457c5..97e839c33d 100644 --- a/server-info.c +++ b/server-info.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "dir.h" #include "environment.h" diff --git a/setup.c b/setup.c index 20f380825b..7e1169eb86 100644 --- a/setup.c +++ b/setup.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "copy.h" diff --git a/shallow.c b/shallow.c index a0b181ba8a..31a6ca40fe 100644 --- a/shallow.c +++ b/shallow.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "hex.h" #include "repository.h" diff --git a/split-index.c b/split-index.c index 058a8f448e..120c8190b1 100644 --- a/split-index.c +++ b/split-index.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "gettext.h" #include "hash.h" diff --git a/streaming.c b/streaming.c index 10adf625b2..38839511af 100644 --- a/streaming.c +++ b/streaming.c @@ -1,6 +1,9 @@ /* * Copyright (c) 2011, Google Inc. */ + +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "convert.h" #include "environment.h" diff --git a/submodule-config.c b/submodule-config.c index ad43a282da..9b0bb0b9f4 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "dir.h" #include "environment.h" diff --git a/submodule.c b/submodule.c index caf3aa5600..ab99a30253 100644 --- a/submodule.c +++ b/submodule.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "repository.h" diff --git a/t/helper/test-bitmap.c b/t/helper/test-bitmap.c index af43ee1cb5..1f18d57007 100644 --- a/t/helper/test-bitmap.c +++ b/t/helper/test-bitmap.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "git-compat-util.h" #include "pack-bitmap.h" diff --git a/t/helper/test-bloom.c b/t/helper/test-bloom.c index 1281e66876..f7f9b62002 100644 --- a/t/helper/test-bloom.c +++ b/t/helper/test-bloom.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "bloom.h" #include "hex.h" diff --git a/t/helper/test-cache-tree.c b/t/helper/test-cache-tree.c index dc89ecfd71..5cdef3ebef 100644 --- a/t/helper/test-cache-tree.c +++ b/t/helper/test-cache-tree.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "gettext.h" #include "hex.h" diff --git a/t/helper/test-dump-cache-tree.c b/t/helper/test-dump-cache-tree.c index 02b0b46c3f..3f0c7d0ed0 100644 --- a/t/helper/test-dump-cache-tree.c +++ b/t/helper/test-dump-cache-tree.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "hash.h" #include "hex.h" diff --git a/t/helper/test-dump-fsmonitor.c b/t/helper/test-dump-fsmonitor.c index 4f215fea02..1b7f37a84f 100644 --- a/t/helper/test-dump-fsmonitor.c +++ b/t/helper/test-dump-fsmonitor.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "read-cache-ll.h" #include "repository.h" diff --git a/t/helper/test-dump-split-index.c b/t/helper/test-dump-split-index.c index f472691a3c..a6720faf9c 100644 --- a/t/helper/test-dump-split-index.c +++ b/t/helper/test-dump-split-index.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "hex.h" #include "read-cache-ll.h" diff --git a/t/helper/test-dump-untracked-cache.c b/t/helper/test-dump-untracked-cache.c index 9ff67c3967..4f010d5324 100644 --- a/t/helper/test-dump-untracked-cache.c +++ b/t/helper/test-dump-untracked-cache.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "dir.h" #include "hex.h" diff --git a/t/helper/test-find-pack.c b/t/helper/test-find-pack.c index e8bd793e58..14b2b0c12c 100644 --- a/t/helper/test-find-pack.c +++ b/t/helper/test-find-pack.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "object-name.h" #include "object-store.h" diff --git a/t/helper/test-fsmonitor-client.c b/t/helper/test-fsmonitor-client.c index 8280984d08..02bfe92e8d 100644 --- a/t/helper/test-fsmonitor-client.c +++ b/t/helper/test-fsmonitor-client.c @@ -3,6 +3,8 @@ * a `git fsmonitor--daemon` daemon. */ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "parse-options.h" #include "fsmonitor-ipc.h" diff --git a/t/helper/test-lazy-init-name-hash.c b/t/helper/test-lazy-init-name-hash.c index 5f33bb7b8f..40f5df4412 100644 --- a/t/helper/test-lazy-init-name-hash.c +++ b/t/helper/test-lazy-init-name-hash.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "environment.h" #include "name-hash.h" diff --git a/t/helper/test-match-trees.c b/t/helper/test-match-trees.c index d0db5ff26f..e0e2048320 100644 --- a/t/helper/test-match-trees.c +++ b/t/helper/test-match-trees.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "hex.h" #include "match-trees.h" diff --git a/t/helper/test-oidmap.c b/t/helper/test-oidmap.c index bd30244a54..c03cfa5ecf 100644 --- a/t/helper/test-oidmap.c +++ b/t/helper/test-oidmap.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "hex.h" #include "object-name.h" diff --git a/t/helper/test-pack-mtimes.c b/t/helper/test-pack-mtimes.c index 67a964ef90..f8f9afbb5b 100644 --- a/t/helper/test-pack-mtimes.c +++ b/t/helper/test-pack-mtimes.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "hex.h" #include "strbuf.h" diff --git a/t/helper/test-reach.c b/t/helper/test-reach.c index 1ba226f1f9..5dd374379c 100644 --- a/t/helper/test-reach.c +++ b/t/helper/test-reach.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "commit.h" #include "commit-reach.h" diff --git a/t/helper/test-read-cache.c b/t/helper/test-read-cache.c index e803c43ece..d285c656bd 100644 --- a/t/helper/test-read-cache.c +++ b/t/helper/test-read-cache.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "config.h" #include "read-cache-ll.h" diff --git a/t/helper/test-read-graph.c b/t/helper/test-read-graph.c index 8c7a83f578..d9e980d04c 100644 --- a/t/helper/test-read-graph.c +++ b/t/helper/test-read-graph.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "commit-graph.h" #include "repository.h" diff --git a/t/helper/test-read-midx.c b/t/helper/test-read-midx.c index 4acae41bb9..83effc2b5f 100644 --- a/t/helper/test-read-midx.c +++ b/t/helper/test-read-midx.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "hex.h" #include "midx.h" diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c index ad24300170..637b8b294e 100644 --- a/t/helper/test-ref-store.c +++ b/t/helper/test-ref-store.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "hex.h" #include "refs.h" diff --git a/t/helper/test-repository.c b/t/helper/test-repository.c index 0c7c5aa4dd..c6a074df3d 100644 --- a/t/helper/test-repository.c +++ b/t/helper/test-repository.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "commit-graph.h" #include "commit.h" diff --git a/t/helper/test-revision-walking.c b/t/helper/test-revision-walking.c index f346951bc2..071f5bd1e2 100644 --- a/t/helper/test-revision-walking.c +++ b/t/helper/test-revision-walking.c @@ -8,6 +8,8 @@ * published by the Free Software Foundation. */ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "commit.h" #include "diff.h" diff --git a/t/helper/test-scrap-cache-tree.c b/t/helper/test-scrap-cache-tree.c index 737cbe475b..64fff6e9e3 100644 --- a/t/helper/test-scrap-cache-tree.c +++ b/t/helper/test-scrap-cache-tree.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "lockfile.h" #include "read-cache-ll.h" diff --git a/t/helper/test-submodule-config.c b/t/helper/test-submodule-config.c index 4b809d9dca..cbe93f2f9e 100644 --- a/t/helper/test-submodule-config.c +++ b/t/helper/test-submodule-config.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "config.h" #include "hash.h" diff --git a/t/helper/test-submodule-nested-repo-config.c b/t/helper/test-submodule-nested-repo-config.c index ecd40ded99..6ca069ce63 100644 --- a/t/helper/test-submodule-nested-repo-config.c +++ b/t/helper/test-submodule-nested-repo-config.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "repository.h" #include "setup.h" diff --git a/t/helper/test-submodule.c b/t/helper/test-submodule.c index 7197969a08..22e518d229 100644 --- a/t/helper/test-submodule.c +++ b/t/helper/test-submodule.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "test-tool-utils.h" #include "parse-options.h" diff --git a/t/helper/test-trace2.c b/t/helper/test-trace2.c index 1adac29a57..cd955ec63e 100644 --- a/t/helper/test-trace2.c +++ b/t/helper/test-trace2.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "strvec.h" #include "run-command.h" diff --git a/t/helper/test-write-cache.c b/t/helper/test-write-cache.c index 7e3da380a9..b37dd2c5d6 100644 --- a/t/helper/test-write-cache.c +++ b/t/helper/test-write-cache.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-tool.h" #include "lockfile.h" #include "read-cache-ll.h" diff --git a/t/unit-tests/t-example-decorate.c b/t/unit-tests/t-example-decorate.c index 3c856a8cf2..a4a75db735 100644 --- a/t/unit-tests/t-example-decorate.c +++ b/t/unit-tests/t-example-decorate.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "test-lib.h" #include "object.h" #include "decorate.h" diff --git a/tag.c b/tag.c index 52bbe50819..d24170e340 100644 --- a/tag.c +++ b/tag.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "environment.h" #include "tag.h" diff --git a/tmp-objdir.c b/tmp-objdir.c index 3509258be5..a8e4553f27 100644 --- a/tmp-objdir.c +++ b/tmp-objdir.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "tmp-objdir.h" #include "abspath.h" diff --git a/transport-helper.c b/transport-helper.c index 9820947ab2..09b3560ffd 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "transport.h" #include "quote.h" diff --git a/transport.c b/transport.c index 83ddea8fbc..b9c8827ed9 100644 --- a/transport.c +++ b/transport.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "advice.h" #include "config.h" diff --git a/tree-walk.c b/tree-walk.c index 535a3a2539..a033397965 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "tree-walk.h" #include "dir.h" diff --git a/tree.c b/tree.c index 7973d3f9a8..ad86ad1ba9 100644 --- a/tree.c +++ b/tree.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "hex.h" #include "tree.h" diff --git a/unpack-trees.c b/unpack-trees.c index 304ea2ed86..7dc884fafd 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "advice.h" #include "strvec.h" diff --git a/upload-pack.c b/upload-pack.c index b726f7a57d..0052c6a4dc 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "environment.h" diff --git a/walker.c b/walker.c index 946d86b04e..0fafdc97cf 100644 --- a/walker.c +++ b/walker.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "gettext.h" #include "hex.h" diff --git a/worktree.c b/worktree.c index 70844d023a..f3c4c8ec54 100644 --- a/worktree.c +++ b/worktree.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "abspath.h" #include "environment.h" diff --git a/wt-status.c b/wt-status.c index 5051f5e599..8815df419e 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "advice.h" #include "wt-status.h" diff --git a/xdiff-interface.c b/xdiff-interface.c index 16ed8ac492..d5dc88661e 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "gettext.h" #include "config.h" -- cgit v1.2.3