From: newren@gmail.com
To: git@vger.kernel.org
Cc: Johannes.Schindelin@gmx.de, kusmabite@gmail.com,
Elijah Newren <newren@gmail.com>
Subject: [PATCHv3 2/7] fast-export: Omit tags that tag trees
Date: Thu, 25 Jun 2009 22:48:28 -0600 [thread overview]
Message-ID: <1245991713-12782-3-git-send-email-newren@gmail.com> (raw)
In-Reply-To: <1245991713-12782-1-git-send-email-newren@gmail.com>
From: Elijah Newren <newren@gmail.com>
Commit c0582c53bcf4e83bba70e1ad23abbad31f96ebc8 introduced logic to just
omit tags that point to tree objects. However, these objects were still
being output and were pointing at "mark :0", which caused fast-import to
crash. This patch makes sure such tags (including deeper nestings such
as tags of tags of trees), are omitted.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
Since the last series, the code has been moved to the handle_tag
function, as suggested by Junio. Also, it now correctly catches and
omits tags of tags of trees, tags of tags of tags of trees, etc.
builtin-fast-export.c | 15 +++++++++++++++
t/t9301-fast-export.sh | 8 +++++++-
2 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index e0cfa60..8c90a2d 100644
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -289,6 +289,21 @@ static void handle_tag(const char *name, struct tag *tag)
char *buf;
const char *tagger, *tagger_end, *message;
size_t message_size = 0;
+ struct object *tagged;
+
+ /* Trees have no identifer in fast-export output, thus we have no way
+ * to output tags of trees, tags of tags of trees, etc. Simply omit
+ * such tags.
+ */
+ tagged = tag->tagged;
+ while (tagged->type == OBJ_TAG) {
+ tagged = ((struct tag *)tagged)->tagged;
+ }
+ if (tagged->type == OBJ_TREE) {
+ warning("Omitting tag %s,\nsince tags of trees (or tags of tags of trees, etc.) are not supported.",
+ sha1_to_hex(tag->object.sha1));
+ return;
+ }
buf = read_sha1_file(tag->object.sha1, &type, &size);
if (!buf)
diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh
index 8c8a9e6..3f13e6b 100755
--- a/t/t9301-fast-export.sh
+++ b/t/t9301-fast-export.sh
@@ -271,8 +271,14 @@ test_expect_success 'set-up a few more tags for tag export tests' '
git tag -a tag-obj_tag-obj -m "tagging a tag" tree_tag-obj
'
+test_expect_success 'tree_tag' '
+ mkdir result &&
+ (cd result && git init) &&
+ git fast-export tree_tag > fe-stream &&
+ (cd result && git fast-import < ../fe-stream)
+'
+
# 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_success 'tag-obj_tag' 'git fast-export tag-obj_tag'
test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
--
1.6.3.2.323.geb889
next prev parent reply other threads:[~2009-06-26 4:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-26 4:48 A few fast export fixups -- round 3 newren
2009-06-26 4:48 ` [PATCHv3 1/7] fast-export: Set revs.topo_order before calling setup_revisions newren
2009-06-26 4:48 ` newren [this message]
2009-06-26 4:48 ` [PATCHv3 3/7] fast-export: Make sure we show actual ref names instead of "(null)" newren
2009-06-26 4:48 ` [PATCHv3 4/7] fast-export: Do parent rewriting to avoid dropping relevant commits newren
2009-06-26 4:48 ` [PATCHv3 5/7] fast-export: Add a --tag-of-filtered-object option for newly dangling tags newren
2009-06-26 4:48 ` [PATCHv3 6/7] Add new fast-export testcases newren
2009-06-26 4:48 ` [PATCHv3 7/7] fast-export: Document the fact that git-rev-list arguments are accepted newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1245991713-12782-3-git-send-email-newren@gmail.com \
--to=newren@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=kusmabite@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).