From fa74052922cf39e5a39ad7178d1b13c2da9b4519 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Wed, 19 Sep 2007 00:49:35 -0400 Subject: Always obtain fetch-pack arguments from struct fetch_pack_args Copying the arguments from a fetch_pack_args into static globals within the builtin-fetch-pack module is error-prone and may lead rise to cases where arguments supplied via the struct from the new fetch_pack() API may not be honored by the implementation. Here we reorganize all of the static globals into a single static struct fetch_pack_args instance and use memcpy() to move the data from the caller supplied structure into the globals before we execute our pack fetching implementation. This strategy is more robust to additions and deletions of properties. As keep_pack is a single bit we have also introduced lock_pack to mean not only download and store the packfile via index-pack but also to lock it against repacking by creating a .keep file when the packfile itself is stored. The caller must remove the .keep file when it is safe to do so. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- fetch-pack.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'fetch-pack.h') diff --git a/fetch-pack.h b/fetch-pack.h index ad1307689d..a7888ea302 100644 --- a/fetch-pack.h +++ b/fetch-pack.h @@ -8,14 +8,17 @@ struct fetch_pack_args int depth; unsigned quiet:1, keep_pack:1, + lock_pack:1, use_thin_pack:1, fetch_all:1, verbose:1, no_progress:1; }; -void setup_fetch_pack(struct fetch_pack_args *args); - -struct ref *fetch_pack(const char *dest, int nr_heads, char **heads, char **pack_lockfile); +struct ref *fetch_pack(struct fetch_pack_args *args, + const char *dest, + int nr_heads, + char **heads, + char **pack_lockfile); #endif -- cgit v1.2.1