Merge branch 'jk/trailers-parse' into next

diff --git a/connected.c b/connected.c
index bf1b12e7ecaf476304811cabc870d58fc7f3f1dd..136c2ac16839b8d4de9b653337dc4794c2a4ea34 100644 (file)
--- 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,22 +15,27 @@ 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;
-       const char *argv[9];
+       struct check_connected_options defaults = CHECK_CONNECTED_INIT;
        char commit[41];
        unsigned char sha1[20];
-       int err = 0, ac = 0;
+       int err = 0;
        struct packed_git *new_pack = NULL;
+       struct transport *transport;
        size_t base_len;
 
-       if (fn(cb_data, sha1))
+       if (!opt)
+               opt = &defaults;
+       transport = opt->transport;
+
+       if (fn(cb_data, sha1)) {
+               if (opt->err_fd)
+                       close(opt->err_fd);
                return err;
+       }
 
        if (transport && transport->smart_options &&
            transport->smart_options->self_contained_and_connected &&
@@ -47,24 +48,29 @@ static int check_everything_connected_real(sha1_iterate_fn fn,
                strbuf_release(&idx_file);
        }
 
-       if (shallow_file) {
-               argv[ac++] = "--shallow-file";
-               argv[ac++] = shallow_file;
+       if (opt->shallow_file) {
+               argv_array_push(&rev_list.args, "--shallow-file");
+               argv_array_push(&rev_list.args, opt->shallow_file);
        }
-       argv[ac++] = "rev-list";
-       argv[ac++] = "--objects";
-       argv[ac++] = "--stdin";
-       argv[ac++] = "--not";
-       argv[ac++] = "--all";
-       if (quiet)
-               argv[ac++] = "--quiet";
-       argv[ac] = NULL;
+       argv_array_push(&rev_list.args,"rev-list");
+       argv_array_push(&rev_list.args, "--objects");
+       argv_array_push(&rev_list.args, "--stdin");
+       argv_array_push(&rev_list.args, "--not");
+       argv_array_push(&rev_list.args, "--all");
+       argv_array_push(&rev_list.args, "--quiet");
+       if (opt->progress)
+               argv_array_pushf(&rev_list.args, "--progress=%s",
+                                _("Checking connectivity"));
 
-       rev_list.argv = argv;
        rev_list.git_cmd = 1;
+       rev_list.env = opt->env;
        rev_list.in = -1;
        rev_list.no_stdout = 1;
-       rev_list.no_stderr = quiet;
+       if (opt->err_fd)
+               rev_list.err = opt->err_fd;
+       else
+               rev_list.no_stderr = opt->quiet;
+
        if (start_command(&rev_list))
                return error(_("Could not run 'git rev-list'"));
 
@@ -98,19 +104,3 @@ static int check_everything_connected_real(sha1_iterate_fn fn,
        sigchain_pop(SIGPIPE);
        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);
-}