fetch-pack: move --keep=* option filling to a function
Move the populating of the --keep=* option argument to "index-pack" to a static function, a subsequent commit will make use of it in another function. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
a6e65fb39c
commit
1f6cf4508e
20
fetch-pack.c
20
fetch-pack.c
@ -847,6 +847,16 @@ static void parse_gitmodules_oids(int fd, struct oidset *gitmodules_oids)
|
|||||||
} while (1);
|
} while (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void add_index_pack_keep_option(struct strvec *args)
|
||||||
|
{
|
||||||
|
char hostname[HOST_NAME_MAX + 1];
|
||||||
|
|
||||||
|
if (xgethostname(hostname, sizeof(hostname)))
|
||||||
|
xsnprintf(hostname, sizeof(hostname), "localhost");
|
||||||
|
strvec_pushf(args, "--keep=fetch-pack %"PRIuMAX " on %s",
|
||||||
|
(uintmax_t)getpid(), hostname);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If packfile URIs were provided, pass a non-NULL pointer to index_pack_args.
|
* If packfile URIs were provided, pass a non-NULL pointer to index_pack_args.
|
||||||
* The strings to pass as the --index-pack-arg arguments to http-fetch will be
|
* The strings to pass as the --index-pack-arg arguments to http-fetch will be
|
||||||
@ -916,14 +926,8 @@ static int get_pack(struct fetch_pack_args *args,
|
|||||||
strvec_push(&cmd.args, "-v");
|
strvec_push(&cmd.args, "-v");
|
||||||
if (args->use_thin_pack)
|
if (args->use_thin_pack)
|
||||||
strvec_push(&cmd.args, "--fix-thin");
|
strvec_push(&cmd.args, "--fix-thin");
|
||||||
if ((do_keep || index_pack_args) && (args->lock_pack || unpack_limit)) {
|
if ((do_keep || index_pack_args) && (args->lock_pack || unpack_limit))
|
||||||
char hostname[HOST_NAME_MAX + 1];
|
add_index_pack_keep_option(&cmd.args);
|
||||||
if (xgethostname(hostname, sizeof(hostname)))
|
|
||||||
xsnprintf(hostname, sizeof(hostname), "localhost");
|
|
||||||
strvec_pushf(&cmd.args,
|
|
||||||
"--keep=fetch-pack %"PRIuMAX " on %s",
|
|
||||||
(uintmax_t)getpid(), hostname);
|
|
||||||
}
|
|
||||||
if (!index_pack_args && args->check_self_contained_and_connected)
|
if (!index_pack_args && args->check_self_contained_and_connected)
|
||||||
strvec_push(&cmd.args, "--check-self-contained-and-connected");
|
strvec_push(&cmd.args, "--check-self-contained-and-connected");
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user