Skip to content

Commit

Permalink
everything_local(): mark alternate refs as complete
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Haggerty authored and Junio C Hamano committed Feb 13, 2012
1 parent c41a802 commit f257659
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions builtin/fetch-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,11 @@ static void filter_refs(struct ref **refs, int nr_match, char **match)
*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;
Expand Down Expand Up @@ -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);
for_each_alternate_ref(mark_alternate_complete, NULL);
if (cutoff)
mark_recent_complete_commits(cutoff);
}
Expand Down
2 changes: 1 addition & 1 deletion t/t5700-clone-reference.sh
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ test_expect_success 'prepare branched repository' '

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 &&
(
Expand Down

0 comments on commit f257659

Please sign in to comment.