everything_local(): mark alternate refs as complete

Objects in an alternate object database are already available to the
local repository and therefore don't need to be fetched.  So mark them
as complete in everything_local().

This fixes a test in t5700.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index dbe9acbc396919eba2e6b5fa6633f6839d15b0c8..0e8560f60f43dd6e971a38381838d217bdc28899 100644 (file)
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -581,6 +581,11 @@ static void filter_refs(struct ref **refs, int nr_match, char **match)
        *refs = newlist;
 }
 
        *refs = newlist;
 }
 

+static void mark_alternate_complete(const struct ref *ref, void *unused)
+{
+       mark_complete(NULL, ref->old_sha1, 0, NULL);
+}
+

 static int everything_local(struct ref **refs, int nr_match, char **match)
 {
        struct ref *ref;
 static int everything_local(struct ref **refs, int nr_match, char **match)
 {
        struct ref *ref;


@@ -609,6 +614,7 @@ static int everything_local(struct ref **refs, int nr_match, char **match)
 
        if (!args.depth) {
                for_each_ref(mark_complete, NULL);
 
        if (!args.depth) {
                for_each_ref(mark_complete, NULL);

+               for_each_alternate_ref(mark_alternate_complete, NULL);

                if (cutoff)
                        mark_recent_complete_commits(cutoff);
        }
                if (cutoff)
                        mark_recent_complete_commits(cutoff);
        }

diff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh
index bd7a1d7dbbe40494ac250251b6543ce7153a6370..bbc4691bd7ef1e3633d4a66440211179fae42a84 100755 (executable)
--- a/t/t5700-clone-reference.sh
+++ b/t/t5700-clone-reference.sh
@@ -167,7 +167,7 @@ test_expect_success 'prepare branched repository' '
 
 rm -f "$U.K"
 
 
 rm -f "$U.K"
 

-test_expect_failure 'fetch with incomplete alternates' '
+test_expect_success 'fetch with incomplete alternates' '

        git init K &&
        echo "$base_dir/A/.git/objects" >K/.git/objects/info/alternates &&
        (
        git init K &&
        echo "$base_dir/A/.git/objects" >K/.git/objects/info/alternates &&
        (