[PATCH 1/7] fast-export: Omit tags that tag trees
- From
newren@gmail.com <newren@gmail.com>
- Date
- Jun 20, 2009, 04:36 UTC
- Message-ID
- <1245472623-28103-2-git-send-email-newren@gmail.com>
- In-Reply-To
- <1245472623-28103-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, a case was missed resulting in a tag being output which pointed at "mark :0", which would cause fast-import to crash.
Signed-off-by: Elijah Newren <newren@gmail.com> --- builtin-fast-export.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/builtin-fast-export.c b/builtin-fast-export.c index 6cef810..891e2d4 100644 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -407,9 +407,15 @@ static void handle_tags_and_duplicates(struct string_list *extra_refs) for (i = extra_refs->nr - 1; i >= 0; i--) { const char *name = extra_refs->items[i].string; struct object *object = extra_refs->items[i].util; + struct tag *tag; switch (object->type) { case OBJ_TAG: - handle_tag(name, (struct tag *)object); + tag = (struct tag *)object; + if (tag->tagged->type == OBJ_TREE) { + /* Ignore this tag altogether */ + return; + } + handle_tag(name, tag); break; case OBJ_COMMIT: /* create refs pointing to already seen commits */
-- 1.6.3.2.323.gfb84f