Dmitry Potapov <dpotapov@xxxxxxxxx> wrote: > If you tried to export the official git repository, and then to import it > back then git-fast-import would die complaining that "Mark :1 not a commit". > > Accordingly to a generated crash file, Mark 1 is not a commit but a blob, > which is pointed by junio-gpg-pub tag. Because git-tag allows to create such > tags, git-fast-import should import them. > > Signed-off-by: Dmitry Potapov <dpotapov@xxxxxxxxx> > --- > fast-import.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/fast-import.c b/fast-import.c > index cd87049..e99990d 100644 > --- a/fast-import.c > +++ b/fast-import.c > @@ -2305,6 +2305,7 @@ static void parse_new_tag(void) > struct tag *t; > uintmax_t from_mark = 0; > unsigned char sha1[20]; > + enum object_type type = OBJ_COMMIT; NAK. Your patch is the right idea. But you need to make sure all of the branch arms are handled correctly. That is, if we do this, the get_sha1() on line 2459 should also permit non-commit objects, and the lookup_branch() earlier up on line 2451 should do "type = OBJ_COMMIT". -- Shawn. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html