diff options
Diffstat (limited to 'connected.c')
| -rw-r--r-- | connected.c | 71 |
1 files changed, 64 insertions, 7 deletions
diff --git a/connected.c b/connected.c index 1e89c1cd1d..299c56090b 100644 --- a/connected.c +++ b/connected.c @@ -2,7 +2,12 @@ #include "run-command.h" #include "sigchain.h" #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 * @@ -14,22 +19,47 @@ * * Returns 0 if everything is connected, non-zero otherwise. */ -int check_everything_connected(sha1_iterate_fn fn, int quiet, void *cb_data) +static int check_everything_connected_real(sha1_iterate_fn fn, + int quiet, + void *cb_data, + struct transport *transport, + const char *shallow_file) { - struct child_process rev_list; - const char *argv[] = {"rev-list", "--objects", - "--stdin", "--not", "--all", NULL, NULL}; + struct child_process rev_list = CHILD_PROCESS_INIT; + const char *argv[9]; char commit[41]; unsigned char sha1[20]; - int err = 0; + int err = 0, ac = 0; + struct packed_git *new_pack = NULL; + size_t base_len; if (fn(cb_data, sha1)) return err; + if (transport && transport->smart_options && + transport->smart_options->self_contained_and_connected && + transport->pack_lockfile && + strip_suffix(transport->pack_lockfile, ".keep", &base_len)) { + struct strbuf idx_file = STRBUF_INIT; + strbuf_add(&idx_file, transport->pack_lockfile, base_len); + strbuf_addstr(&idx_file, ".idx"); + new_pack = add_packed_git(idx_file.buf, idx_file.len, 1); + strbuf_release(&idx_file); + } + + if (shallow_file) { + argv[ac++] = "--shallow-file"; + argv[ac++] = shallow_file; + } + argv[ac++] = "rev-list"; + argv[ac++] = "--objects"; + argv[ac++] = "--stdin"; + argv[ac++] = "--not"; + argv[ac++] = "--all"; if (quiet) - argv[5] = "--quiet"; + argv[ac++] = "--quiet"; + argv[ac] = NULL; - memset(&rev_list, 0, sizeof(rev_list)); rev_list.argv = argv; rev_list.git_cmd = 1; rev_list.in = -1; @@ -42,6 +72,17 @@ int check_everything_connected(sha1_iterate_fn fn, int quiet, void *cb_data) commit[40] = '\n'; do { + /* + * If index-pack already checked that: + * - there are no dangling pointers in the new pack + * - the pack is self contained + * Then if the updated ref is in the new pack, then we + * are sure the ref is good and not sending it to + * rev-list for verification. + */ + if (new_pack && find_pack_entry_one(sha1, new_pack)) + continue; + memcpy(commit, sha1_to_hex(sha1), 40); if (write_in_full(rev_list.in, commit, 41) < 0) { if (errno != EPIPE && errno != EINVAL) @@ -60,3 +101,19 @@ int check_everything_connected(sha1_iterate_fn fn, int quiet, void *cb_data) 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); +} |