summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-02 22:30:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-02 22:30:46 (GMT)
commit09ca61304986395352594b08acab3d161fdbd81b (patch)
tree014f11aba1f8773a3554b45a97948bb74fd72ca5 /revision.c
parent7c85ee6c5818f4409a29e40cc406ef5db9560af8 (diff)
parent8c4cc326896de1a1501135c529b0596fa6327969 (diff)
downloadgit-09ca61304986395352594b08acab3d161fdbd81b.zip
git-09ca61304986395352594b08acab3d161fdbd81b.tar.gz
git-09ca61304986395352594b08acab3d161fdbd81b.tar.bz2
Merge branch 'jt/tags-to-promised-blobs-fix'
The lazy clone support had a few places where missing but promised objects were not correctly tolerated, which have been fixed. * jt/tags-to-promised-blobs-fix: tag: don't warn if target is missing but promised revision: tolerate promised targets of tags
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index 8bd2e27..0627494 100644
--- a/revision.c
+++ b/revision.c
@@ -251,6 +251,9 @@ static struct commit *handle_commit(struct rev_info *revs,
if (!object) {
if (revs->ignore_missing_links || (flags & UNINTERESTING))
return NULL;
+ if (revs->exclude_promisor_objects &&
+ is_promisor_object(&tag->tagged->oid))
+ return NULL;
die("bad object %s", oid_to_hex(&tag->tagged->oid));
}
object->flags |= flags;