]> git.ipfire.org Git - thirdparty/git.git/commit - combine-diff.c
libs: use "struct repository *" argument, not "the_repository"
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 28 Mar 2023 13:58:58 +0000 (15:58 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Mar 2023 14:36:46 +0000 (07:36 -0700)
commit4a93b899c19794c28b140bf78a13fb9c2b34f433
treeba8e48e3f695c614cb959e75edf8bc7ae5eadbe2
parentc7c33f50bd1bb168a8c69157a0735ded84084f20
libs: use "struct repository *" argument, not "the_repository"

As can easily be seen from grepping in our sources, we had these uses
of "the_repository" in various library code in cases where the
function in question was already getting a "struct repository *"
argument. Let's use that argument instead.

Out of these changes only the changes to "cache-tree.c",
"commit-reach.c", "shallow.c" and "upload-pack.c" would have cleanly
applied before the migration away from the "repo_*()" wrapper macros
in the preceding commits.

The rest aren't new, as we'd previously implicitly refer to
"the_repository", but it's now more obvious that we were doing the
wrong thing all along, and should have used the parameter instead.

The change to change "get_index_format_default(the_repository)" in
"read-cache.c" to use the "r" variable instead should arguably have
been part of [1], or in the subsequent cleanup in [2]. Let's do it
here, as can be seen from the initial code in [3] it's not important
that we use "the_repository" there, but would prefer to always use the
current repository.

This change excludes the "the_repository" use in "upload-pack.c"'s
upload_pack_advertise(), as the in-flight [4] makes that change.

1. ee1f0c242ef (read-cache: add index.skipHash config option,
   2023-01-06)
2. 6269f8eaad0 (treewide: always have a valid "index_state.repo"
   member, 2023-01-17)
3. 7211b9e7534 (repo-settings: consolidate some config settings,
   2019-08-13)
4. <Y/hbUsGPVNAxTdmS@coredump.intra.peff.net>

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 files changed:
add-interactive.c
branch.c
builtin/replace.c
cache-tree.c
combine-diff.c
commit-graph.c
commit-reach.c
merge-recursive.c
notes-cache.c
notes-utils.c
object-name.c
read-cache.c
reset.c
sequencer.c
shallow.c
tree.c
wt-status.c