repository: move global r_f_p_c to repo struct

Move repository_format_partial_clone, which is currently a global
variable, into struct repository. (Full support for per-repository
partial clone config will be done in a subsequent commit - this is split
into its own commit because of the extent of the changes needed.)

The new repo-specific variable cannot be set in
check_repository_format_gently() (as is currently), because that
function does not know which repo it is operating on (or even whether
the value is important); therefore this responsibility is delegated to
the outermost caller that knows. Of all the outermost callers that know
(found by looking at all functions that call clear_repository_format()),
I looked at those that either read from the main Git directory or write
into a struct repository. These callers have been modified accordingly
(write to the_repository in the former case and write to the given
struct repository in the latter case).

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Tan
2021-06-17 10:13:22 -07:00
committed by Junio C Hamano
parent ebf3c04b26
commit ebaf3bcf1a
5 changed files with 23 additions and 20 deletions

View File

@@ -5,13 +5,6 @@
#include "transport.h"
#include "strvec.h"
static char *repository_format_partial_clone;
void set_repository_format_partial_clone(char *partial_clone)
{
repository_format_partial_clone = xstrdup_or_null(partial_clone);
}
static int fetch_objects(const char *remote_name,
const struct object_id *oids,
int oid_nr)
@@ -145,15 +138,15 @@ static void promisor_remote_init(void)
git_config(promisor_remote_config, NULL);
if (repository_format_partial_clone) {
if (the_repository->repository_format_partial_clone) {
struct promisor_remote *o, *previous;
o = promisor_remote_lookup(repository_format_partial_clone,
o = promisor_remote_lookup(the_repository->repository_format_partial_clone,
&previous);
if (o)
promisor_remote_move_to_tail(o, previous);
else
promisor_remote_new(repository_format_partial_clone);
promisor_remote_new(the_repository->repository_format_partial_clone);
}
}