From: Erik Faye-Lund <kusmabite@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Erik Faye-Lund <kusmabite@gmail.com>
Subject: [PATCH 2/4] builtin-fast-export.c: turn error into warning
Date: Sun, 22 Mar 2009 21:50:18 +0000 [thread overview]
Message-ID: <1237758620-6116-2-git-send-email-kusmabite@gmail.com> (raw)
In-Reply-To: <1237758620-6116-1-git-send-email-kusmabite@gmail.com>
fast-import doesn't have a syntax to support tree-objects (and some other
object-types), so fast-export shouldn't handle them. However, aborting the
operation is a bit drastic. This patch turns the error into a warning instead.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
builtin-fast-export.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index fdf4ae9..02bad1f 100644
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -378,8 +378,10 @@ static void get_tags_and_duplicates(struct object_array *pending,
}
break;
default:
- die ("Unexpected object of type %s",
- typename(e->item->type));
+ warning("%s: Unexpected object of type %s, skipping.",
+ e->name,
+ typename(e->item->type));
+ continue;
}
if (commit->util)
/* more than one name for the same object */
--
1.6.2.1.226.gcb2dd
next prev parent reply other threads:[~2009-03-22 21:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-22 21:50 [PATCH 1/4] test-suite: adding a test for fast-export with tag variants Erik Faye-Lund
2009-03-22 21:50 ` Erik Faye-Lund [this message]
2009-03-22 21:50 ` [PATCH 3/4] builtin-fast-export.c: fix crash on tagged trees Erik Faye-Lund
2009-03-22 21:50 ` [PATCH 4/4] builtin-fast-export.c: handle nested tags Erik Faye-Lund
2009-03-23 0:39 ` [PATCH 3/4] builtin-fast-export.c: fix crash on tagged trees Junio C Hamano
2009-03-23 1:01 ` Erik Faye-Lund
2009-03-23 0:39 ` [PATCH 1/4] test-suite: adding a test for fast-export with tag variants Junio C Hamano
2009-03-23 0:55 ` Erik Faye-Lund
2009-03-23 3:41 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2009-03-23 12:53 Erik Faye-Lund
2009-03-23 12:53 ` [PATCH 2/4] builtin-fast-export.c: turn error into warning Erik Faye-Lund
2009-03-30 9:08 [PATCH 1/4] test-suite: adding a test for fast-export with tag variants Erik Faye-Lund
2009-03-30 9:08 ` [PATCH 2/4] builtin-fast-export.c: turn error into warning Erik Faye-Lund
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=1237758620-6116-2-git-send-email-kusmabite@gmail.com \
--to=kusmabite@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.