path: root/connected.c
diff options
authorJeff King <>2016-07-15 10:30:40 (GMT)
committerJunio C Hamano <>2016-07-20 19:10:53 (GMT)
commit7043c7071cdbdef60ce8413f425da622b8e6dc85 (patch)
treed966559d68f37aa0d2d7e36bd9659c27a2c7fda7 /connected.c
parent3be89f9b86cb3891a7865ad004230a50977e3d8c (diff)
check_everything_connected: use a struct with named options
The number of variants of check_everything_connected has grown over the years, so that the "real" function takes several possibly-zero, possibly-NULL arguments. We hid the complexity behind some wrapper functions, but this doesn't scale well when we want to add new options. If we add more wrapper variants to handle the new options, then we can get a combinatorial explosion when those options might be used together (right now nobody wants to use both "shallow" and "transport" together, so we get by with just a few wrappers). If instead we add new parameters to each function, each of which can have a default value, then callers who want the defaults end up with confusing invocations like: check_everything_connected(fn, 0, data, -1, 0, NULL); where it is unclear which parameter is which (and every caller needs updated when we add new options). Instead, let's add a struct to hold all of the optional parameters. This is a little more verbose for the callers (who have to declare the struct and fill it in), but it makes their code much easier to follow, because every option is named as it is set (and unused options do not have to be mentioned at all). Note that we could also stick the iteration function and its callback data into the option struct, too. But since those are required for each call, by avoiding doing so, we can let very simple callers just pass "NULL" for the options and not worry about the struct at all. While we're touching each site, let's also rename the function to check_connected(). The existing name was quite long, and not all of the wrappers even used the full name. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'connected.c')
1 files changed, 11 insertions, 28 deletions
diff --git a/connected.c b/connected.c
index a3bfc4e..2a51eac 100644
--- a/connected.c
+++ b/connected.c
@@ -4,10 +4,6 @@
#include "connected.h"
#include "transport.h"
-int check_everything_connected(sha1_iterate_fn fn, int quiet, void *cb_data)
- return check_everything_connected_with_transport(fn, quiet, cb_data, NULL);
* If we feed all the commits we want to verify to this command
@@ -19,19 +15,22 @@ int check_everything_connected(sha1_iterate_fn fn, int quiet, void *cb_data)
* Returns 0 if everything is connected, non-zero otherwise.
-static int check_everything_connected_real(sha1_iterate_fn fn,
- int quiet,
- void *cb_data,
- struct transport *transport,
- const char *shallow_file)
+int check_connected(sha1_iterate_fn fn, void *cb_data,
+ struct check_connected_options *opt)
struct child_process rev_list = CHILD_PROCESS_INIT;
+ struct check_connected_options defaults = CHECK_CONNECTED_INIT;
char commit[41];
unsigned char sha1[20];
int err = 0;
struct packed_git *new_pack = NULL;
+ struct transport *transport;
size_t base_len;
+ if (!opt)
+ opt = &defaults;
+ transport = opt->transport;
if (fn(cb_data, sha1))
return err;
@@ -46,9 +45,9 @@ static int check_everything_connected_real(sha1_iterate_fn fn,
- if (shallow_file) {
+ if (opt->shallow_file) {
argv_array_push(&rev_list.args, "--shallow-file");
- argv_array_push(&rev_list.args, shallow_file);
+ argv_array_push(&rev_list.args, opt->shallow_file);
argv_array_push(&rev_list.args, "--objects");
@@ -60,7 +59,7 @@ static int check_everything_connected_real(sha1_iterate_fn fn,
rev_list.git_cmd = 1; = -1;
rev_list.no_stdout = 1;
- rev_list.no_stderr = quiet;
+ rev_list.no_stderr = opt->quiet;
if (start_command(&rev_list))
return error(_("Could not run 'git rev-list'"));
@@ -94,19 +93,3 @@ static int check_everything_connected_real(sha1_iterate_fn fn,
return finish_command(&rev_list) || err;
-int check_everything_connected_with_transport(sha1_iterate_fn fn,
- int quiet,
- void *cb_data,
- struct transport *transport)
- return check_everything_connected_real(fn, quiet, cb_data,
- transport, NULL);
-int check_shallow_connected(sha1_iterate_fn fn, int quiet, void *cb_data,
- const char *shallow_file)
- return check_everything_connected_real(fn, quiet, cb_data,
- NULL, shallow_file);