diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2018-07-13 03:03:06 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-16 22:56:14 +0300 |
| commit | dc0a13f6813f35bae5fd2de6af4d5524a20d5b82 (patch) | |
| tree | 6b78e5172d41cb0363e323e5f72c170f7d3bdc97 /revision.c | |
| parent | a7e67c11b8b983b4a9f56f0b8990a550946ed6b0 (diff) | |
revision: tolerate promised targets of tags
In handle_commit(), it is fatal for an annotated tag to point to a
non-existent object. --exclude-promisor-objects should relax this rule
and allow non-existent objects that are promisor objects, but this is
not the case. Update handle_commit() to tolerate this situation.
This was observed when cloning from a repository with an annotated tag
pointing to a blob. The test included in this patch demonstrates this
case.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/revision.c b/revision.c index 1b37da988d..95546e6d44 100644 --- a/revision.c +++ b/revision.c @@ -248,6 +248,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; |