diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-19 02:16:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-19 02:16:19 (GMT) |
| commit | e33fd3c326831e70f6ca078e0f1c26ec147cb5b3 (patch) | |
| tree | af0d9467c65cc9cb2d71a93451057d239c14181c /fast-import.c | |
| parent | 4a88fb7ffc32bdfdfab2605430514d92aba25b8a (diff) | |
| parent | 6f9752d2e29ecbd5d9489e57bfcd28fb030cba97 (diff) | |
| download | git-e33fd3c326831e70f6ca078e0f1c26ec147cb5b3.zip git-e33fd3c326831e70f6ca078e0f1c26ec147cb5b3.tar.gz git-e33fd3c326831e70f6ca078e0f1c26ec147cb5b3.tar.bz2 | |
Merge branch 'maint'
* maint:
Update draft release notes to 1.6.6.1
grep: NUL terminate input from a file
fast-import: tag may point to any object type
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fast-import.c b/fast-import.c index 52d33bc..25c3588 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2356,6 +2356,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; @@ -2376,19 +2377,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); @@ -2413,7 +2413,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); |