# Re: [PATCH] fast-import: tag may point to any object type 5 messages from 2010-01-11 to 2010-01-14. Participants: Shawn O. Pearce, Dmitry Potapov. Thread: https://gitlist.dev/t/22170 ## Dmitry Potapov, 2010-01-11 05:02 Subject: [PATCH] fast-import: tag may point to any object type Message-ID: <1263186165-23920-1-git-send-email-dpotapov@gmail.com> URL: https://gitlist.dev/e/1263186165-23920-1-git-send-email-dpotapov%40gmail.com ``` 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 --- 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; /* Obtain the new tag name from the rest of our command */ sp = strchr(command_buf.buf, ' ') + 1; @@ -2329,8 +2330,7 @@ static void parse_new_tag(void) struct object_entry *oe; from_mark = strtoumax(from + 1, NULL, 10); oe = find_mark(from_mark); - if (oe->type != OBJ_COMMIT) - die("Mark :%" PRIuMAX " not a commit", from_mark); + type = oe->type; hashcpy(sha1, oe->sha1); } else if (!get_sha1(from, sha1)) { unsigned long size; @@ -2362,7 +2362,7 @@ static void parse_new_tag(void) "object %s\n" "type %s\n" "tag %s\n", - sha1_to_hex(sha1), commit_type, t->name); + sha1_to_hex(sha1), typename(type), t->name); if (tagger) strbuf_addf(&new_data, "tagger %s\n", tagger); -- 1.6.6 ``` ## Shawn O. Pearce, 2010-01-11 17:14 Subject: Re: [PATCH] fast-import: tag may point to any object type Message-ID: <20100111171454.GO32155@spearce.org> URL: https://gitlist.dev/e/20100111171454.GO32155%40spearce.org In-Reply-To: <1263186165-23920-1-git-send-email-dpotapov@gmail.com> ``` Dmitry Potapov 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 > --- > 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. ``` ## Dmitry Potapov, 2010-01-13 12:35 Subject: [PATCH v2] fast-import: tag may point to any object type Message-ID: <20100113123532.GC10586@dpotapov.dyndns.org> URL: https://gitlist.dev/e/20100113123532.GC10586%40dpotapov.dyndns.org In-Reply-To: <20100111171454.GO32155@spearce.org> ``` 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 --- On Mon, Jan 11, 2010 at 09:14:54AM -0800, Shawn O. Pearce wrote: > > 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". Thank you for guideliness. I do not understand this code well. I hope I got it right this time. fast-import.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fast-import.c b/fast-import.c index cd87049..4fdf809 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; /* Obtain the new tag name from the rest of our command */ sp = strchr(command_buf.buf, ' ') + 1; @@ -2325,19 +2326,20 @@ static void parse_new_tag(void) s = lookup_branch(from); if (s) { hashcpy(sha1, s->sha1); + type = OBJ_COMMIT; } else if (*from == ':') { struct object_entry *oe; from_mark = strtoumax(from + 1, NULL, 10); oe = find_mark(from_mark); - if (oe->type != OBJ_COMMIT) - die("Mark :%" PRIuMAX " not a commit", from_mark); + type = oe->type; hashcpy(sha1, oe->sha1); } else if (!get_sha1(from, sha1)) { unsigned long size; char *buf; + type = sha1_object_info(sha1, NULL); buf = read_object_with_reference(sha1, - commit_type, &size, sha1); + typename(type), &size, sha1); if (!buf || size < 46) die("Not a valid commit: %s", from); free(buf); @@ -2362,7 +2364,7 @@ static void parse_new_tag(void) "object %s\n" "type %s\n" "tag %s\n", - sha1_to_hex(sha1), commit_type, t->name); + sha1_to_hex(sha1), typename(type), t->name); if (tagger) strbuf_addf(&new_data, "tagger %s\n", tagger); -- 1.6.6.137.g1acb ``` ## Shawn O. Pearce, 2010-01-13 17:24 Subject: Re: [PATCH v2] fast-import: tag may point to any object type Message-ID: <20100113172456.GB18625@spearce.org> URL: https://gitlist.dev/e/20100113172456.GB18625%40spearce.org In-Reply-To: <20100113123532.GC10586@dpotapov.dyndns.org> ``` Dmitry Potapov 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". ... > diff --git a/fast-import.c b/fast-import.c > index cd87049..4fdf809 100644 > --- a/fast-import.c > +++ b/fast-import.c > @@ -2325,19 +2326,20 @@ static void parse_new_tag(void) > } else if (!get_sha1(from, sha1)) { > unsigned long size; > char *buf; > > + type = sha1_object_info(sha1, NULL); > buf = read_object_with_reference(sha1, > - commit_type, &size, sha1); > + typename(type), &size, sha1); This is better spelled as: buf = read_sha1_file(sha1, &type, &size); But otherwise the patch looks correct now, thanks. If you could make this one change, add my Acked-by: Shawn O. Pearce and resend so Junio can apply, thanks. -- Shawn. ``` ## Dmitry Potapov, 2010-01-14 04:44 Subject: [PATCH v3] fast-import: tag may point to any object type Message-ID: <20100114044419.GE10586@dpotapov.dyndns.org> URL: https://gitlist.dev/e/20100114044419.GE10586%40dpotapov.dyndns.org In-Reply-To: <20100113172456.GB18625@spearce.org> ``` 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 Acked-by: Shawn O. Pearce --- On Wed, Jan 13, 2010 at 09:24:56AM -0800, Shawn O. Pearce wrote: > Dmitry Potapov wrote: > > > > + type = sha1_object_info(sha1, NULL); > > buf = read_object_with_reference(sha1, > > - commit_type, &size, sha1); > > + typename(type), &size, sha1); > > This is better spelled as: > > buf = read_sha1_file(sha1, &type, &size); Thank you for correction. > > But otherwise the patch looks correct now, thanks. > > If you could make this one change, add my > > Acked-by: Shawn O. Pearce > > and resend so Junio can apply, thanks. fast-import.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fast-import.c b/fast-import.c index cd87049..60d0aa2 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; /* Obtain the new tag name from the rest of our command */ sp = strchr(command_buf.buf, ' ') + 1; @@ -2325,19 +2326,18 @@ static void parse_new_tag(void) s = lookup_branch(from); if (s) { hashcpy(sha1, s->sha1); + type = OBJ_COMMIT; } else if (*from == ':') { struct object_entry *oe; from_mark = strtoumax(from + 1, NULL, 10); oe = find_mark(from_mark); - if (oe->type != OBJ_COMMIT) - die("Mark :%" PRIuMAX " not a commit", from_mark); + type = oe->type; hashcpy(sha1, oe->sha1); } else if (!get_sha1(from, sha1)) { unsigned long size; char *buf; - buf = read_object_with_reference(sha1, - commit_type, &size, sha1); + buf = read_sha1_file(sha1, &type, &size); if (!buf || size < 46) die("Not a valid commit: %s", from); free(buf); @@ -2362,7 +2362,7 @@ static void parse_new_tag(void) "object %s\n" "type %s\n" "tag %s\n", - sha1_to_hex(sha1), commit_type, t->name); + sha1_to_hex(sha1), typename(type), t->name); if (tagger) strbuf_addf(&new_data, "tagger %s\n", tagger); -- 1.6.6.137.g1acb ```