# [PATCH 4/4] builtin-fast-export.c: handle nested tags 4 messages from 2009-03-30 to 2009-03-30. Participants: Erik Faye-Lund. Thread: https://gitlist.dev/t/18637 ## Erik Faye-Lund, 2009-03-30 09:08 Subject: [PATCH 1/4] test-suite: adding a test for fast-export with tag variants Message-ID: <1238404137-6693-1-git-send-email-kusmabite@gmail.com> URL: https://gitlist.dev/e/1238404137-6693-1-git-send-email-kusmabite%40gmail.com ``` Signed-off-by: Erik Faye-Lund --- t/t9301-fast-export.sh | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh index b860626..763dde5 100755 --- a/t/t9301-fast-export.sh +++ b/t/t9301-fast-export.sh @@ -262,4 +262,21 @@ test_expect_success 'cope with tagger-less tags' ' ' +test_expect_success 'set-up a few more tags for tag export tests' ' + + git checkout -f master && + HEAD_TREE=`git show -s --pretty=raw HEAD | grep tree | sed "s/tree //"` && + git tag tree_tag -m "tagging a tree" $HEAD_TREE && + git tag -a tree_tag-obj -m "tagging a tree" $HEAD_TREE && + git tag tag-obj_tag -m "tagging a tag" tree_tag-obj && + git tag -a tag-obj_tag-obj -m "tagging a tag" tree_tag-obj + +' + +# NEEDSWORK: not just check return status, but validate the output +test_expect_failure 'tree_tag' 'git fast-export tree_tag' +test_expect_failure '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_done -- 1.6.2.1 ``` ## Erik Faye-Lund, 2009-03-30 09:08 Subject: [PATCH 2/4] builtin-fast-export.c: turn error into warning Message-ID: <1238404137-6693-2-git-send-email-kusmabite@gmail.com> URL: https://gitlist.dev/e/1238404137-6693-2-git-send-email-kusmabite%40gmail.com In-Reply-To: <1238404137-6693-1-git-send-email-kusmabite@gmail.com> ``` fast-import doesn't have a syntax to support tree-objects (and some other object-types), so fast-export shouldn't handle them. However, aborting the operation is a bit drastic. This patch turns the error into a warning instead. Signed-off-by: Erik Faye-Lund --- builtin-fast-export.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/builtin-fast-export.c b/builtin-fast-export.c index 34a419c..027c4aa 100644 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -379,8 +379,10 @@ static void get_tags_and_duplicates(struct object_array *pending, } break; default: - die ("Unexpected object of type %s", - typename(e->item->type)); + warning("%s: Unexpected object of type %s, skipping.", + e->name, + typename(e->item->type)); + continue; } if (commit->util) /* more than one name for the same object */ -- 1.6.2.1 ``` ## Erik Faye-Lund, 2009-03-30 09:08 Subject: [PATCH 3/4] builtin-fast-export.c: fix crash on tagged trees Message-ID: <1238404137-6693-3-git-send-email-kusmabite@gmail.com> URL: https://gitlist.dev/e/1238404137-6693-3-git-send-email-kusmabite%40gmail.com In-Reply-To: <1238404137-6693-2-git-send-email-kusmabite@gmail.com> ``` If a tag object points to a tree (or another unhandled type), the commit- pointer is left uninitialized and later dereferenced. This patch adds a default case to the switch that issues a warning and skips the object. Signed-off-by: Erik Faye-Lund --- builtin-fast-export.c | 4 ++++ t/t9301-fast-export.sh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/builtin-fast-export.c b/builtin-fast-export.c index 027c4aa..2070288 100644 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -376,6 +376,10 @@ static void get_tags_and_duplicates(struct object_array *pending, case OBJ_BLOB: handle_object(tag->object.sha1); continue; + default: + warning("Tag points to object of unexpected type %s, skipping.", + typename(tag->object.type)); + continue; } break; default: diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh index 763dde5..b587feb 100755 --- a/t/t9301-fast-export.sh +++ b/t/t9301-fast-export.sh @@ -274,8 +274,8 @@ 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_failure 'tree_tag' 'git fast-export tree_tag' -test_expect_failure 'tree_tag-obj' 'git fast-export tree_tag-obj' +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' -- 1.6.2.1 ``` ## Erik Faye-Lund, 2009-03-30 09:08 Subject: [PATCH 4/4] builtin-fast-export.c: handle nested tags Message-ID: <1238404137-6693-4-git-send-email-kusmabite@gmail.com> URL: https://gitlist.dev/e/1238404137-6693-4-git-send-email-kusmabite%40gmail.com In-Reply-To: <1238404137-6693-3-git-send-email-kusmabite@gmail.com> ``` When tags that points to tags are passed to fast-export, an error 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 --- builtin-fast-export.c | 5 ++++- 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 2070288..b23a502 100644 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -363,7 +363,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; } @@ -376,7 +379,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 b587feb..495c051 100755 --- a/t/t9301-fast-export.sh +++ b/t/t9301-fast-export.sh @@ -276,7 +276,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 -- 1.6.2.1 ```