diff options
| author | Erik Faye-Lund <kusmabite@gmail.com> | 2009-03-23 12:53:09 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-19 12:29:26 -0700 |
| commit | aadd44404baab7b1f7234c8815bfd1e6c980cd99 (patch) | |
| tree | 9504a82679b6b491b11f53f9a43ef83974f93554 | |
| parent | 426193c025eb76125a99b3fe143eea50e849f9ca (diff) | |
| download | git-aadd44404baab7b1f7234c8815bfd1e6c980cd99.tar.gz git-aadd44404baab7b1f7234c8815bfd1e6c980cd99.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>
| -rw-r--r-- | builtin-fast-export.c | 5 | ||||
| -rwxr-xr-x | t/t9301-fast-export.sh | 4 |
2 files changed, 6 insertions, 3 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; diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh index b1f75ceea..4a87f3625 100755 --- a/t/t9301-fast-export.sh +++ b/t/t9301-fast-export.sh @@ -271,7 +271,7 @@ test_expect_success 'set-up a few more tags for tag export tests' ' # NEEDSWORK: not just check return status, but validate the output test_expect_success 'tree_tag' 'git fast-export tree_tag' test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj' -test_expect_failure 'tag-obj_tag' 'git fast-export tag-obj_tag' -test_expect_failure 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj' +test_expect_success 'tag-obj_tag' 'git fast-export tag-obj_tag' +test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj' test_done |