mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
c41a802fe9
commit
f257659132
|
@ -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;
|
||||
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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 &&
|
||||
(
|
||||
|
|
Loading…
Reference in a new issue