[PATCH v3] fast-import: tag may point to any object type
- From
Dmitry Potapov <dpotapov@gmail.com>
- Date
- Jan 14, 2010, 04:44 UTC
- Message-ID
- <20100114044419.GE10586@dpotapov.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 <dpotapov@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> ---
On Wed, Jan 13, 2010 at 09:24:56AM -0800, Shawn O. Pearce wrote:
Show 10 quoted lines
> Dmitry Potapov <dpotapov@gmail.com> 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.
Show 8 quoted lines
> > But otherwise the patch looks correct now, thanks. > > If you could make this one change, add my > > Acked-by: Shawn O. Pearce <spearce@spearce.org> > > 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