All of lore.kernel.org
 help / color / mirror / Atom feed
From: newren@gmail.com
To: git@vger.kernel.org
Cc: Johannes.Schindelin@gmx.de, kusambite@gmail.com,
	Elijah Newren <newren@gmail.com>
Subject: [PATCH 1/7] fast-export: Omit tags that tag trees
Date: Fri, 19 Jun 2009 22:36:57 -0600	[thread overview]
Message-ID: <1245472623-28103-2-git-send-email-newren@gmail.com> (raw)
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

  reply	other threads:[~2009-06-20  4:47 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-20  4:36 A few fast-export fixups newren
2009-06-20  4:36 ` newren [this message]
2009-06-20 17:31   ` [PATCH 1/7] fast-export: Omit tags that tag trees Jeff King
2009-06-20 18:01     ` Elijah Newren
2009-06-20 18:52       ` Jeff King
2009-06-20  4:36 ` [PATCH 2/7] Modify fast-export testcase to check that we correctly omit tags of trees newren
2009-06-21  5:53   ` Stephen Boyd
2009-06-21  6:17   ` Johannes Sixt
2009-06-22 13:12     ` Elijah Newren
2009-06-20  4:36 ` [PATCH 3/7] fast-export: Make sure we show actual ref names instead of "(null)" newren
2009-06-20  4:37 ` [PATCH 4/7] fast-export: Do parent rewriting to avoid dropping relevant commits newren
2009-06-20  4:37 ` [PATCH 5/7] fast-export: Add a --tag-of-filtered-object option for newly dangling tags newren
2009-06-20  4:37 ` [PATCH 6/7] Add new fast-export testcases newren
2009-06-20  4:37 ` [PATCH 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1245472623-28103-2-git-send-email-newren@gmail.com \
    --to=newren@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=kusambite@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.