2005-04-28 18:46:33 +04:00
|
|
|
#include "cache.h"
|
2006-01-07 12:33:54 +03:00
|
|
|
#include "tag.h"
|
2007-02-26 22:56:00 +03:00
|
|
|
#include "commit.h"
|
|
|
|
#include "tree.h"
|
|
|
|
#include "blob.h"
|
2005-04-28 18:46:33 +04:00
|
|
|
|
2010-11-10 14:17:27 +03:00
|
|
|
#define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"
|
2010-11-10 14:17:30 +03:00
|
|
|
#define PGP_MESSAGE "-----BEGIN PGP MESSAGE-----"
|
2010-11-10 14:17:27 +03:00
|
|
|
|
2005-04-28 18:46:33 +04:00
|
|
|
const char *tag_type = "tag";
|
|
|
|
|
2005-11-03 02:19:13 +03:00
|
|
|
struct object *deref_tag(struct object *o, const char *warn, int warnlen)
|
2005-08-05 11:47:56 +04:00
|
|
|
{
|
2006-07-12 07:45:31 +04:00
|
|
|
while (o && o->type == OBJ_TAG)
|
2008-02-18 10:31:55 +03:00
|
|
|
if (((struct tag *)o)->tagged)
|
|
|
|
o = parse_object(((struct tag *)o)->tagged->sha1);
|
|
|
|
else
|
|
|
|
o = NULL;
|
2005-11-03 02:19:13 +03:00
|
|
|
if (!o && warn) {
|
|
|
|
if (!warnlen)
|
|
|
|
warnlen = strlen(warn);
|
|
|
|
error("missing object referenced by '%.*s'", warnlen, warn);
|
|
|
|
}
|
2005-08-05 11:47:56 +04:00
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
upload-pack: avoid parsing tag destinations
When upload-pack advertises refs, it dereferences any tags
it sees, and shows the resulting sha1 to the client. It does
this by calling deref_tag. That function must load and parse
each tag object to find the sha1 of the tagged object.
However, it also ends up parsing the tagged object itself,
which is not strictly necessary for upload-pack's use.
Each tag produces two object loads (assuming it is not a
recursive tag), when it could get away with only a single
one. Dropping the second load halves the effort we spend.
The downside is that we are no longer verifying the
resulting object by loading it. In particular:
1. We never cross-check the "type" field given in the tag
object with the type of the pointed-to object. If the
tag says it points to a tag but doesn't, then we will
keep peeling and realize the error. If the tag says it
points to a non-tag but actually points to a tag, we
will stop peeling and just advertise the pointed-to
tag.
2. If we are missing the pointed-to object, we will not
realize (because we never even look it up in the object
db).
However, both of these are errors in the object database,
and both will be detected if a client actually requests the
broken objects in question. So we are simply pushing the
verification away from the advertising stage, and down to
the actual fetching stage.
On my test repo with 120K refs, this drops the time to
advertise the refs from ~3.2s to ~2.0s.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-01-06 23:18:01 +04:00
|
|
|
struct object *deref_tag_noverify(struct object *o)
|
|
|
|
{
|
|
|
|
while (o && o->type == OBJ_TAG) {
|
|
|
|
o = parse_object(o->sha1);
|
|
|
|
if (o && o->type == OBJ_TAG && ((struct tag *)o)->tagged)
|
|
|
|
o = ((struct tag *)o)->tagged;
|
|
|
|
else
|
|
|
|
o = NULL;
|
|
|
|
}
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
2005-06-03 19:05:39 +04:00
|
|
|
struct tag *lookup_tag(const unsigned char *sha1)
|
2005-04-28 18:46:33 +04:00
|
|
|
{
|
2007-04-17 09:11:43 +04:00
|
|
|
struct object *obj = lookup_object(sha1);
|
|
|
|
if (!obj)
|
|
|
|
return create_object(sha1, OBJ_TAG, alloc_tag_node());
|
2005-05-21 00:59:17 +04:00
|
|
|
if (!obj->type)
|
2006-07-12 07:45:31 +04:00
|
|
|
obj->type = OBJ_TAG;
|
2010-09-06 09:32:05 +04:00
|
|
|
if (obj->type != OBJ_TAG) {
|
|
|
|
error("Object %s is a %s, not a tag",
|
|
|
|
sha1_to_hex(sha1), typename(obj->type));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return (struct tag *) obj;
|
2005-04-28 18:46:33 +04:00
|
|
|
}
|
|
|
|
|
2010-04-13 03:25:28 +04:00
|
|
|
static unsigned long parse_tag_date(const char *buf, const char *tail)
|
|
|
|
{
|
|
|
|
const char *dateptr;
|
|
|
|
|
|
|
|
while (buf < tail && *buf++ != '>')
|
|
|
|
/* nada */;
|
|
|
|
if (buf >= tail)
|
|
|
|
return 0;
|
|
|
|
dateptr = buf;
|
|
|
|
while (buf < tail && *buf++ != '\n')
|
|
|
|
/* nada */;
|
|
|
|
if (buf >= tail)
|
|
|
|
return 0;
|
|
|
|
/* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
|
|
|
|
return strtoul(dateptr, NULL, 10);
|
|
|
|
}
|
|
|
|
|
2011-02-05 13:52:20 +03:00
|
|
|
int parse_tag_buffer(struct tag *item, const void *data, unsigned long size)
|
2005-04-28 18:46:33 +04:00
|
|
|
{
|
2007-02-26 22:56:00 +03:00
|
|
|
unsigned char sha1[20];
|
2005-06-22 04:35:10 +04:00
|
|
|
char type[20];
|
2010-04-13 03:25:27 +04:00
|
|
|
const char *bufptr = data;
|
|
|
|
const char *tail = bufptr + size;
|
|
|
|
const char *nl;
|
2005-04-30 20:51:03 +04:00
|
|
|
|
2010-04-13 03:25:25 +04:00
|
|
|
if (item->object.parsed)
|
|
|
|
return 0;
|
|
|
|
item->object.parsed = 1;
|
2005-04-28 18:46:33 +04:00
|
|
|
|
|
|
|
if (size < 64)
|
2005-05-06 21:48:34 +04:00
|
|
|
return -1;
|
2010-04-13 03:25:27 +04:00
|
|
|
if (memcmp("object ", bufptr, 7) || get_sha1_hex(bufptr + 7, sha1) || bufptr[47] != '\n')
|
2005-05-06 21:48:34 +04:00
|
|
|
return -1;
|
2010-04-13 03:25:27 +04:00
|
|
|
bufptr += 48; /* "object " + sha1 + "\n" */
|
2005-04-28 18:46:33 +04:00
|
|
|
|
2013-12-01 00:55:40 +04:00
|
|
|
if (!starts_with(bufptr, "type "))
|
2005-05-06 21:48:34 +04:00
|
|
|
return -1;
|
2010-04-13 03:25:27 +04:00
|
|
|
bufptr += 5;
|
|
|
|
nl = memchr(bufptr, '\n', tail - bufptr);
|
|
|
|
if (!nl || sizeof(type) <= (nl - bufptr))
|
2005-05-06 21:48:34 +04:00
|
|
|
return -1;
|
2010-04-13 03:25:27 +04:00
|
|
|
strncpy(type, bufptr, nl - bufptr);
|
|
|
|
type[nl - bufptr] = '\0';
|
|
|
|
bufptr = nl + 1;
|
2005-04-28 18:46:33 +04:00
|
|
|
|
2007-02-26 22:56:00 +03:00
|
|
|
if (!strcmp(type, blob_type)) {
|
|
|
|
item->tagged = &lookup_blob(sha1)->object;
|
|
|
|
} else if (!strcmp(type, tree_type)) {
|
|
|
|
item->tagged = &lookup_tree(sha1)->object;
|
|
|
|
} else if (!strcmp(type, commit_type)) {
|
|
|
|
item->tagged = &lookup_commit(sha1)->object;
|
|
|
|
} else if (!strcmp(type, tag_type)) {
|
|
|
|
item->tagged = &lookup_tag(sha1)->object;
|
|
|
|
} else {
|
|
|
|
error("Unknown type %s", type);
|
|
|
|
item->tagged = NULL;
|
|
|
|
}
|
|
|
|
|
2013-12-01 00:55:40 +04:00
|
|
|
if (bufptr + 4 < tail && starts_with(bufptr, "tag "))
|
2011-02-14 16:02:51 +03:00
|
|
|
; /* good */
|
|
|
|
else
|
2010-04-13 03:25:27 +04:00
|
|
|
return -1;
|
|
|
|
bufptr += 4;
|
|
|
|
nl = memchr(bufptr, '\n', tail - bufptr);
|
|
|
|
if (!nl)
|
|
|
|
return -1;
|
|
|
|
item->tag = xmemdupz(bufptr, nl - bufptr);
|
|
|
|
bufptr = nl + 1;
|
|
|
|
|
2013-12-01 00:55:40 +04:00
|
|
|
if (bufptr + 7 < tail && starts_with(bufptr, "tagger "))
|
2010-04-13 03:25:28 +04:00
|
|
|
item->date = parse_tag_date(bufptr, tail);
|
|
|
|
else
|
|
|
|
item->date = 0;
|
|
|
|
|
2005-04-28 18:46:33 +04:00
|
|
|
return 0;
|
2005-05-06 21:48:34 +04:00
|
|
|
}
|
2005-05-04 21:44:15 +04:00
|
|
|
|
2005-05-06 21:48:34 +04:00
|
|
|
int parse_tag(struct tag *item)
|
|
|
|
{
|
2007-02-26 22:55:59 +03:00
|
|
|
enum object_type type;
|
2005-05-06 21:48:34 +04:00
|
|
|
void *data;
|
|
|
|
unsigned long size;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (item->object.parsed)
|
|
|
|
return 0;
|
2007-02-26 22:55:59 +03:00
|
|
|
data = read_sha1_file(item->object.sha1, &type, &size);
|
2005-05-06 21:48:34 +04:00
|
|
|
if (!data)
|
|
|
|
return error("Could not read %s",
|
|
|
|
sha1_to_hex(item->object.sha1));
|
2007-02-26 22:55:59 +03:00
|
|
|
if (type != OBJ_TAG) {
|
2005-05-06 21:48:34 +04:00
|
|
|
free(data);
|
|
|
|
return error("Object %s not a tag",
|
|
|
|
sha1_to_hex(item->object.sha1));
|
|
|
|
}
|
|
|
|
ret = parse_tag_buffer(item, data, size);
|
2005-05-04 21:44:15 +04:00
|
|
|
free(data);
|
2005-05-06 21:48:34 +04:00
|
|
|
return ret;
|
2005-04-28 18:46:33 +04:00
|
|
|
}
|
2010-11-10 14:17:27 +03:00
|
|
|
|
2011-09-08 08:19:47 +04:00
|
|
|
/*
|
|
|
|
* Look at a signed tag object, and return the offset where
|
|
|
|
* the embedded detached signature begins, or the end of the
|
|
|
|
* data when there is no such signature.
|
|
|
|
*/
|
2010-11-10 14:17:27 +03:00
|
|
|
size_t parse_signature(const char *buf, unsigned long size)
|
|
|
|
{
|
|
|
|
char *eol;
|
|
|
|
size_t len = 0;
|
2013-12-01 00:55:40 +04:00
|
|
|
while (len < size && !starts_with(buf + len, PGP_SIGNATURE) &&
|
|
|
|
!starts_with(buf + len, PGP_MESSAGE)) {
|
2010-11-10 14:17:27 +03:00
|
|
|
eol = memchr(buf + len, '\n', size - len);
|
|
|
|
len += eol ? eol - (buf + len) + 1 : size - len;
|
|
|
|
}
|
|
|
|
return len;
|
|
|
|
}
|