summaryrefslogtreecommitdiff
path: root/builtin-fast-export.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2009-06-25 22:48:28 -0600
committerJunio C Hamano <gitster@pobox.com>2009-06-27 14:10:09 -0700
commit02c48cd69b3ebfac3867f0f9ceb1503a5af118fc (patch)
tree66994995f7af4de50adbca725914df6360a78c91 /builtin-fast-export.c
parent668f3aa776bcd293de08413bf1b25b91c15f1b01 (diff)
downloadgit-02c48cd69b3ebfac3867f0f9ceb1503a5af118fc.tar.gz
fast-export: Omit tags that tag trees
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-fast-export.c')
-rw-r--r--builtin-fast-export.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index e0cfa606dc..8c90a2df67 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)