diff options
author | Jonathan Tan <jonathantanmy@google.com> | 2018-07-13 03:03:07 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-07-16 22:56:14 +0300 |
commit | 8c4cc326896de1a1501135c529b0596fa6327969 (patch) | |
tree | 1a46a40eedfcc18270e328259b3f3fff211a5c01 /tag.c | |
parent | dc0a13f6813f35bae5fd2de6af4d5524a20d5b82 (diff) |
tag: don't warn if target is missing but promised
deref_tag() prints a warning if the object that a tag refers to does not
exist. However, when a partial clone has an annotated tag from its
promisor remote, but not the object that it refers to, printing a
warning on such a tag is incorrect.
This occurs, for example, when the checkout that happens after a partial
clone causes some objects to be fetched - and as part of the fetch, all
local refs are read. The test included in this patch demonstrates this
situation.
Therefore, do not print a warning in this case.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tag.c')
-rw-r--r-- | tag.c | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -4,6 +4,7 @@ #include "tree.h" #include "blob.h" #include "gpg-interface.h" +#include "packfile.h" const char *tag_type = "tag"; @@ -64,12 +65,18 @@ int gpg_verify_tag(const struct object_id *oid, const char *name_to_report, struct object *deref_tag(struct object *o, const char *warn, int warnlen) { + struct object_id *last_oid = NULL; while (o && o->type == OBJ_TAG) - if (((struct tag *)o)->tagged) - o = parse_object(&((struct tag *)o)->tagged->oid); - else + if (((struct tag *)o)->tagged) { + last_oid = &((struct tag *)o)->tagged->oid; + o = parse_object(last_oid); + } else { + last_oid = NULL; o = NULL; + } if (!o && warn) { + if (last_oid && is_promisor_object(last_oid)) + return NULL; if (!warnlen) warnlen = strlen(warn); error("missing object referenced by '%.*s'", warnlen, warn); |