From mboxrd@z Thu Jan 1 00:00:00 1970 From: Erik Faye-Lund Subject: [PATCH 4/4] builtin-fast-export.c: handle nested tags Date: Mon, 23 Mar 2009 12:53:09 +0000 Message-ID: <1237812789-1360-4-git-send-email-kusmabite@gmail.com> References: <1237812789-1360-1-git-send-email-kusmabite@gmail.com> <1237812789-1360-2-git-send-email-kusmabite@gmail.com> <1237812789-1360-3-git-send-email-kusmabite@gmail.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN Content-Transfer-Encoding: 7BIT Cc: gitster@pobox.com, Erik Faye-Lund To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Mar 23 13:54:45 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1Lljfv-0006Lx-Aq for gcvg-git-2@gmane.org; Mon, 23 Mar 2009 13:54:43 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755907AbZCWMxN (ORCPT ); Mon, 23 Mar 2009 08:53:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755678AbZCWMxK (ORCPT ); Mon, 23 Mar 2009 08:53:10 -0400 Received: from mx.getmail.no ([84.208.15.66]:36785 "EHLO get-mta-out01.get.basefarm.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754065AbZCWMxH (ORCPT ); Mon, 23 Mar 2009 08:53:07 -0400 Received: from mx.getmail.no ([10.5.16.4]) by get-mta-out01.get.basefarm.net (Sun Java(tm) System Messaging Server 7.0-0.04 64bit (built Jun 20 2008)) with ESMTP id <0KGY002L4MGGX1B0@get-mta-out01.get.basefarm.net> for git@vger.kernel.org; Mon, 23 Mar 2009 13:53:05 +0100 (MET) Received: from localhost.localdomain ([84.215.187.169]) by get-mta-in02.get.basefarm.net (Sun Java(tm) System Messaging Server 7.0-0.04 64bit (built Jun 20 2008)) with ESMTP id <0KGY00AGTMGCW510@get-mta-in02.get.basefarm.net> for git@vger.kernel.org; Mon, 23 Mar 2009 13:53:04 +0100 (MET) X-PMX-Version: 5.5.3.366731, Antispam-Engine: 2.7.0.366912, Antispam-Data: 2009.3.23.123715 X-Mailer: git-send-email 1.6.2.GIT In-reply-to: <1237812789-1360-3-git-send-email-kusmabite@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 e716eee..8083c5f 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 79ca832..7e94893 100755 --- a/t/t9301-fast-export.sh +++ b/t/t9301-fast-export.sh @@ -267,7 +267,7 @@ test_expect_success 'cope with tagger-less tags' ' # 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.225.g9a4a0.dirty