fetch-pack: objects in our alternates are available to us

gitster · gitster · commit e52d719266a0 · 2011-03-17T16:18:55.000-07:00
Use the helper function split from the receiving end of "git push" to
allow the same optimization on the receiving end of "git fetch".

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
Acked-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
@@ -9,6 +9,7 @@
 #include "fetch-pack.h"
 #include "remote.h"
 #include "run-command.h"
+#include "transport.h"
 
 static int transfer_unpack_limit = -1;
 static int fetch_unpack_limit = -1;
@@ -217,6 +218,16 @@ static void send_request(int fd, struct strbuf *buf)
 		safe_write(fd, buf->buf, buf->len);
 }
 
+static void insert_one_alternate_ref(const struct ref *ref, void *unused)
+{
+	rev_list_insert_ref(NULL, ref->old_sha1, 0, NULL);
+}
+
+static void insert_alternate_refs(void)
+{
+	foreach_alt_odb(refs_from_alternate_cb, insert_one_alternate_ref);
+}
+
 static int find_common(int fd[2], unsigned char *result_sha1,
 		       struct ref *refs)
 {
@@ -235,6 +246,7 @@ static int find_common(int fd[2], unsigned char *result_sha1,
 	marked = 1;
 
 	for_each_ref(rev_list_insert_ref, NULL);
+	insert_alternate_refs();
 
 	fetching = 0;
 	for ( ; refs ; refs = refs->next) {
diff --git a/t/t5501-fetch-push-alternates.sh b/t/t5501-fetch-push-alternates.sh
@@ -54,7 +54,7 @@ test_expect_success 'pushing into a repository with the same alternate' '
 	test_cmp one.count receiver.count
 '
 
-test_expect_failure 'fetching from a repository with the same alternate' '
+test_expect_success 'fetching from a repository with the same alternate' '
 	(
 		cd fetcher &&
 		git fetch ../one master:refs/heads/it &&

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ test_expect_success 'pushing into a repository with the same alternate' '`
`54`	`54`	`test_cmp one.count receiver.count`
`55`	`55`	`'`
`56`	`56`
`57`		`-test_expect_failure 'fetching from a repository with the same alternate' '`
	`57`	`+test_expect_success 'fetching from a repository with the same alternate' '`
`58`	`58`	`(`
`59`	`59`	`cd fetcher &&`
`60`	`60`	`git fetch ../one master:refs/heads/it &&`