aboutsummaryrefslogtreecommitdiff
path: root/builtin-fast-export.c
diff options
context:
space:
mode:
authorErik Faye-Lund <kusmabite@gmail.com>2009-03-23 12:53:09 +0000
committerJunio C Hamano <gitster@pobox.com>2009-03-29 19:48:43 -0700
commit1982467d9229e3c92157f2a41363365dcb866e86 (patch)
tree1793fed564f89f4c62411261c882bdc270486791 /builtin-fast-export.c
parentc0582c53bcf4e83bba70e1ad23abbad31f96ebc8 (diff)
downloadgit-1982467d9229e3c92157f2a41363365dcb866e86.tar.gz
git-1982467d9229e3c92157f2a41363365dcb866e86.tar.xz
builtin-fast-export.c: handle nested tags
When tags that points to tags are passed to fast-export, an error is given, saying "Tag [TAGNAME] points nowhere?". This fix calls parse_object() on the object before referencing it's tag, to ensure the tag-info is fully initialized. In addition, it inserts a comment to point out where nested tags are handled. This is consistent with the comment for signed tags. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-fast-export.c')
-rw-r--r--builtin-fast-export.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index 1ec459f05..f171ee4a2 100644
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -362,7 +362,10 @@ static void get_tags_and_duplicates(struct object_array *pending,
break;
case OBJ_TAG:
tag = (struct tag *)e->item;
+
+ /* handle nested tags */
while (tag && tag->object.type == OBJ_TAG) {
+ parse_object(tag->object.sha1);
string_list_append(full_name, extra_refs)->util = tag;
tag = (struct tag *)tag->tagged;
}
@@ -375,7 +378,7 @@ static void get_tags_and_duplicates(struct object_array *pending,
case OBJ_BLOB:
handle_object(tag->object.sha1);
continue;
- default:
+ default: /* OBJ_TAG (nested tags) is already handled */
warning("Tag points to object of unexpected type %s, skipping.",
typename(tag->object.type));
continue;