{"thread":{"id":"18637","subject":"[PATCH 4/4] builtin-fast-export.c: handle nested tags","startedAt":"2009-03-30T09:08:54Z","lastAt":"2009-03-30T09:08:57Z","messageCount":4,"participants":["Erik Faye-Lund"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"109864","messageId":"1238404137-6693-1-git-send-email-kusmabite@gmail.com","threadId":"18637","inReplyTo":null,"subject":"[PATCH 1/4] test-suite: adding a test for fast-export with tag variants","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@gmail.com","sentAt":"2009-03-30T09:08:54Z","receivedAt":"2009-03-30T09:08:54Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"Signed-off-by: Erik Faye-Lund \n---\n t/t9301-fast-export.sh | 17 +++++++++++++++++\n 1 files changed, 17 insertions(+), 0 deletions(-)\n\ndiff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh\nindex b860626..763dde5 100755\n--- a/t/t9301-fast-export.sh\n+++ b/t/t9301-fast-export.sh\n@@ -262,4 +262,21 @@ test_expect_success 'cope with tagger-less tags' '\n \n '\n \n+test_expect_success 'set-up a few more tags for tag export tests' '\n+\n+\tgit checkout -f master &&\n+\tHEAD_TREE=`git show -s --pretty=raw HEAD | grep tree | sed \"s/tree //\"` &&\n+\tgit tag tree_tag -m \"tagging a tree\" $HEAD_TREE &&\n+\tgit tag -a tree_tag-obj -m \"tagging a tree\" $HEAD_TREE &&\n+\tgit tag tag-obj_tag -m \"tagging a tag\" tree_tag-obj &&\n+\tgit tag -a tag-obj_tag-obj -m \"tagging a tag\" tree_tag-obj\n+\n+'\n+\n+# NEEDSWORK: not just check return status, but validate the output\n+test_expect_failure 'tree_tag' 'git fast-export tree_tag'\n+test_expect_failure 'tree_tag-obj' 'git fast-export tree_tag-obj'\n+test_expect_failure 'tag-obj_tag' 'git fast-export tag-obj_tag'\n+test_expect_failure 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'\n+\n test_done\n-- \n1.6.2.1\n"},{"id":"109865","messageId":"1238404137-6693-2-git-send-email-kusmabite@gmail.com","threadId":"18637","inReplyTo":"1238404137-6693-1-git-send-email-kusmabite@gmail.com","subject":"[PATCH 2/4] builtin-fast-export.c: turn error into warning","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@gmail.com","sentAt":"2009-03-30T09:08:55Z","receivedAt":"2009-03-30T09:08:55Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"fast-import doesn't have a syntax to support tree-objects (and some other\nobject-types), so fast-export shouldn't handle them. However, aborting the\noperation is a bit drastic. This patch turns the error into a warning instead.\n\nSigned-off-by: Erik Faye-Lund \n---\n builtin-fast-export.c | 6 ++++--\n 1 files changed, 4 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin-fast-export.c b/builtin-fast-export.c\nindex 34a419c..027c4aa 100644\n--- a/builtin-fast-export.c\n+++ b/builtin-fast-export.c\n@@ -379,8 +379,10 @@ static void get_tags_and_duplicates(struct object_array *pending,\n \t\t\t}\n \t\t\tbreak;\n \t\tdefault:\n-\t\t\tdie (\"Unexpected object of type %s\",\n-\t\t\t typename(e->item->type));\n+\t\t\twarning(\"%s: Unexpected object of type %s, skipping.\",\n+\t\t\t e->name,\n+\t\t\t typename(e->item->type));\n+\t\t\tcontinue;\n \t\t}\n \t\tif (commit->util)\n \t\t\t/* more than one name for the same object */\n-- \n1.6.2.1\n"},{"id":"109866","messageId":"1238404137-6693-3-git-send-email-kusmabite@gmail.com","threadId":"18637","inReplyTo":"1238404137-6693-2-git-send-email-kusmabite@gmail.com","subject":"[PATCH 3/4] builtin-fast-export.c: fix crash on tagged trees","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@gmail.com","sentAt":"2009-03-30T09:08:56Z","receivedAt":"2009-03-30T09:08:56Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"If a tag object points to a tree (or another unhandled type), the commit-\npointer is left uninitialized and later dereferenced. This patch adds a default\ncase to the switch that issues a warning and skips the object.\n\nSigned-off-by: Erik Faye-Lund \n---\n builtin-fast-export.c | 4 ++++\n t/t9301-fast-export.sh | 4 ++--\n 2 files changed, 6 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin-fast-export.c b/builtin-fast-export.c\nindex 027c4aa..2070288 100644\n--- a/builtin-fast-export.c\n+++ b/builtin-fast-export.c\n@@ -376,6 +376,10 @@ static void get_tags_and_duplicates(struct object_array *pending,\n \t\t\tcase OBJ_BLOB:\n \t\t\t\thandle_object(tag->object.sha1);\n \t\t\t\tcontinue;\n+\t\t\tdefault:\n+\t\t\t\twarning(\"Tag points to object of unexpected type %s, skipping.\",\n+\t\t\t\t typename(tag->object.type));\n+\t\t\t\tcontinue;\n \t\t\t}\n \t\t\tbreak;\n \t\tdefault:\ndiff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh\nindex 763dde5..b587feb 100755\n--- a/t/t9301-fast-export.sh\n+++ b/t/t9301-fast-export.sh\n@@ -274,8 +274,8 @@ test_expect_success 'set-up a few more tags for tag export tests' '\n '\n \n # NEEDSWORK: not just check return status, but validate the output\n-test_expect_failure 'tree_tag' 'git fast-export tree_tag'\n-test_expect_failure 'tree_tag-obj' 'git fast-export tree_tag-obj'\n+test_expect_success 'tree_tag' 'git fast-export tree_tag'\n+test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj'\n test_expect_failure 'tag-obj_tag' 'git fast-export tag-obj_tag'\n test_expect_failure 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'\n \n-- \n1.6.2.1\n"},{"id":"109863","messageId":"1238404137-6693-4-git-send-email-kusmabite@gmail.com","threadId":"18637","inReplyTo":"1238404137-6693-3-git-send-email-kusmabite@gmail.com","subject":"[PATCH 4/4] builtin-fast-export.c: handle nested tags","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@gmail.com","sentAt":"2009-03-30T09:08:57Z","receivedAt":"2009-03-30T09:08:57Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"When tags that points to tags are passed to fast-export, an error saying\n\"Tag [TAGNAME] points nowhere?\". This fix calls parse_object() on the object\nbefore referencing it's tag, to ensure the tag-info is fully initialized. In\naddition, it inserts a comment to point out where nested tags are handled. This\nis consistent with the comment for signed tags.\n\nSigned-off-by: Erik Faye-Lund \n---\n builtin-fast-export.c | 5 ++++-\n t/t9301-fast-export.sh | 4 ++--\n 2 files changed, 6 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin-fast-export.c b/builtin-fast-export.c\nindex 2070288..b23a502 100644\n--- a/builtin-fast-export.c\n+++ b/builtin-fast-export.c\n@@ -363,7 +363,10 @@ static void get_tags_and_duplicates(struct object_array *pending,\n \t\t\tbreak;\n \t\tcase OBJ_TAG:\n \t\t\ttag = (struct tag *)e->item;\n+\n+\t\t\t/* handle nested tags */\n \t\t\twhile (tag && tag->object.type == OBJ_TAG) {\n+\t\t\t\tparse_object(tag->object.sha1);\n \t\t\t\tstring_list_append(full_name, extra_refs)->util = tag;\n \t\t\t\ttag = (struct tag *)tag->tagged;\n \t\t\t}\n@@ -376,7 +379,7 @@ static void get_tags_and_duplicates(struct object_array *pending,\n \t\t\tcase OBJ_BLOB:\n \t\t\t\thandle_object(tag->object.sha1);\n \t\t\t\tcontinue;\n-\t\t\tdefault:\n+\t\t\tdefault: /* OBJ_TAG (nested tags) is already handled */\n \t\t\t\twarning(\"Tag points to object of unexpected type %s, skipping.\",\n \t\t\t\t typename(tag->object.type));\n \t\t\t\tcontinue;\ndiff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh\nindex b587feb..495c051 100755\n--- a/t/t9301-fast-export.sh\n+++ b/t/t9301-fast-export.sh\n@@ -276,7 +276,7 @@ test_expect_success 'set-up a few more tags for tag export tests' '\n # NEEDSWORK: not just check return status, but validate the output\n test_expect_success 'tree_tag' 'git fast-export tree_tag'\n test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj'\n-test_expect_failure 'tag-obj_tag' 'git fast-export tag-obj_tag'\n-test_expect_failure 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'\n+test_expect_success 'tag-obj_tag' 'git fast-export tag-obj_tag'\n+test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'\n \n test_done\n-- \n1.6.2.1\n"}]}