X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fetch-pack.c;h=65659826601eb9c850266539f6c9e7807a0b467e;hb=f8348be3be8493a62110a09ab0343213990b416b;hp=3be77c3a8e76c6bc08414e9467c1dc1d0d91c6d1;hpb=23d61f8343282643c830e1c446962b213dbcc09a;p=git.git diff --git a/fetch-pack.c b/fetch-pack.c index 3be77c3a..65659826 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -19,7 +19,7 @@ static const char *exec = "git-upload-pack"; #define POPPED (1U << 4) static struct commit_list *rev_list = NULL; -static int non_common_revs = 0; +static int non_common_revs = 0, multi_ack = 0; static void rev_list_push(struct commit *commit, int mark) { @@ -38,9 +38,9 @@ static void rev_list_push(struct commit *commit, int mark) static int rev_list_insert_ref(const char *path, const unsigned char *sha1) { - struct object *o = deref_tag(parse_object(sha1)); + struct object *o = deref_tag(parse_object(sha1), path, 0); - if (o->type == commit_type) + if (o && o->type == commit_type) rev_list_push((struct commit *)o, SEEN); return 0; @@ -153,20 +153,12 @@ static int find_common(int fd[2], unsigned char *result_sha1, * reachable and we have already scanned it. */ if (((o = lookup_object(remote)) != NULL) && - (o->flags & COMPLETE)) { - o = deref_tag(o); - - if (o->type == commit_type) { - struct commit *commit = (struct commit *)o; - - rev_list_push(commit, COMMON_REF | SEEN); - - mark_common(commit, 1, 1); - } + (o->flags & COMPLETE)) { continue; } - packet_write(fd[1], "want %s\n", sha1_to_hex(remote)); + packet_write(fd[1], "want %s%s\n", sha1_to_hex(remote), + multi_ack ? " multi_ack" : ""); fetching++; } packet_flush(fd[1]); @@ -180,6 +172,8 @@ static int find_common(int fd[2], unsigned char *result_sha1, if (verbose) fprintf(stderr, "have %s\n", sha1_to_hex(sha1)); if (!(31 & ++count)) { + int ack; + packet_flush(fd[1]); flushes++; @@ -189,29 +183,47 @@ static int find_common(int fd[2], unsigned char *result_sha1, */ if (count == 32) continue; - if (get_ack(fd[0], result_sha1)) { - flushes = 0; - retval = 0; - if (verbose) - fprintf(stderr, "got ack\n"); - break; - } + + do { + ack = get_ack(fd[0], result_sha1); + if (verbose && ack) + fprintf(stderr, "got ack %d %s\n", ack, + sha1_to_hex(result_sha1)); + if (ack == 1) { + flushes = 0; + multi_ack = 0; + retval = 0; + goto done; + } else if (ack == 2) { + struct commit *commit = + lookup_commit(result_sha1); + mark_common(commit, 0, 1); + retval = 0; + } + } while (ack); flushes--; } } - +done: packet_write(fd[1], "done\n"); if (verbose) fprintf(stderr, "done\n"); - if (retval != 0) + if (retval != 0) { + multi_ack = 0; flushes++; - while (flushes) { - flushes--; - if (get_ack(fd[0], result_sha1)) { + } + while (flushes || multi_ack) { + int ack = get_ack(fd[0], result_sha1); + if (ack) { if (verbose) - fprintf(stderr, "got ack\n"); - return 0; + fprintf(stderr, "got ack (%d) %s\n", ack, + sha1_to_hex(result_sha1)); + if (ack == 1) + return 0; + multi_ack = 1; + continue; } + flushes--; } return retval; } @@ -247,7 +259,29 @@ static void mark_recent_complete_commits(unsigned long cutoff) } } -static int everything_local(struct ref *refs) +static void filter_refs(struct ref **refs, int nr_match, char **match) +{ + struct ref *prev, *current, *next; + + if (!nr_match) + return; + + for (prev = NULL, current = *refs; current; current = next) { + next = current->next; + if ((!memcmp(current->name, "refs/", 5) && + check_ref_format(current->name + 5)) || + !path_match(current->name, nr_match, match)) { + if (prev == NULL) + *refs = next; + else + prev->next = next; + free(current); + } else + prev = current; + } +} + +static int everything_local(struct ref **refs, int nr_match, char **match) { struct ref *ref; int retval; @@ -256,7 +290,7 @@ static int everything_local(struct ref *refs) track_object_refs = 0; save_commit_buffer = 0; - for (ref = refs; ref; ref = ref->next) { + for (ref = *refs; ref; ref = ref->next) { struct object *o; o = parse_object(ref->old_sha1); @@ -278,28 +312,48 @@ static int everything_local(struct ref *refs) if (cutoff) mark_recent_complete_commits(cutoff); - for (retval = 1; refs ; refs = refs->next) { - const unsigned char *remote = refs->old_sha1; + /* + * Mark all complete remote refs as common refs. + * Don't mark them common yet; the server has to be told so first. + */ + for (ref = *refs; ref; ref = ref->next) { + struct object *o = deref_tag(lookup_object(ref->old_sha1), + NULL, 0); + + if (!o || o->type != commit_type || !(o->flags & COMPLETE)) + continue; + + if (!(o->flags & SEEN)) { + rev_list_push((struct commit *)o, COMMON_REF | SEEN); + + mark_common((struct commit *)o, 1, 1); + } + } + + filter_refs(refs, nr_match, match); + + for (retval = 1, ref = *refs; ref ; ref = ref->next) { + const unsigned char *remote = ref->old_sha1; unsigned char local[20]; struct object *o; - o = parse_object(remote); + o = lookup_object(remote); if (!o || !(o->flags & COMPLETE)) { retval = 0; if (!verbose) continue; fprintf(stderr, "want %s (%s)\n", sha1_to_hex(remote), - refs->name); + ref->name); continue; } - memcpy(refs->new_sha1, local, 20); + memcpy(ref->new_sha1, local, 20); if (!verbose) continue; fprintf(stderr, "already have %s (%s)\n", sha1_to_hex(remote), - refs->name); + ref->name); } return retval; } @@ -311,12 +365,17 @@ static int fetch_pack(int fd[2], int nr_match, char **match) int status; pid_t pid; - get_remote_heads(fd[0], &ref, nr_match, match, 1); + get_remote_heads(fd[0], &ref, 0, NULL, 0); + if (server_supports("multi_ack")) { + if (verbose) + fprintf(stderr, "Server supports multi_ack\n"); + multi_ack = 1; + } if (!ref) { packet_flush(fd[1]); die("no matching remote head"); } - if (everything_local(ref)) { + if (everything_local(&ref, nr_match, match)) { packet_flush(fd[1]); goto all_done; } @@ -399,5 +458,19 @@ int main(int argc, char **argv) close(fd[0]); close(fd[1]); finish_connect(pid); + + if (!ret && nr_heads) { + /* If the heads to pull were given, we should have + * consumed all of them by matching the remote. + * Otherwise, 'git-fetch remote no-such-ref' would + * silently succeed without issuing an error. + */ + for (i = 0; i < nr_heads; i++) + if (heads[i] && heads[i][0]) { + error("no such remote ref %s", heads[i]); + ret = 1; + } + } + return ret; }