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

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 <gitster@pobox.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index b9994139345834a58b08a5ce57cf59c124e21760..4c25968e16b75793a4938bcdf70b937ae3cba923 100644 (file)
--- 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 "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;
 
 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);
 }
 
                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)
 {
 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);
        marked = 1;
 
        for_each_ref(rev_list_insert_ref, NULL);

+       insert_alternate_refs();

 
        fetching = 0;
        for ( ; refs ; refs = refs->next) {
 
        fetching = 0;
        for ( ; refs ; refs = refs->next) {

diff --git a/t/t5501-fetch-push-alternates.sh b/t/t5501-fetch-push-alternates.sh
index 16a467654c7353d2faf64a6a3131c27e99262978..b5ced8483a8fc663eb53b514bbb56df92f217deb 100755 (executable)
--- 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_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 &&
        (
                cd fetcher &&
                git fetch ../one master:refs/heads/it &&