mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/parse-object-cached'

Browse Source 
* jk/parse-object-cached:
  upload-pack: avoid parsing tag destinations
  upload-pack: avoid parsing objects during ref advertisement
  parse_object: try internal cache before reading object db
This commit is contained in:
Junio C Hamano
2012-01-29 13:18:55 -08:00
parent 2bbf77dde2 90108a2441
commit d1afa8baa2
4 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
upload-pack.c
View File

@ -724,11 +724,14 @@ static int send_ref(const char *refname, const unsigned char *sha1, int flag, vo
static const char *capabilities = "multi_ack thin-pack side-band"
" side-band-64k ofs-delta shallow no-progress"
" include-tag multi_ack_detailed";
struct object *o = parse_object(sha1);
struct object *o = lookup_unknown_object(sha1);
const char *refname_nons = strip_namespace(refname);
if (!o)
die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
if (o->type == OBJ_NONE) {
o->type = sha1_object_info(sha1, NULL);
if (o->type < 0)
die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
}
if (capabilities)
packet_write(1, "%s %s%c%s%s\n", sha1_to_hex(sha1), refname_nons,
@ -742,7 +745,7 @@ static int send_ref(const char *refname, const unsigned char *sha1, int flag, vo
nr_our_refs++;
}
if (o->type == OBJ_TAG) {
o = deref_tag(o, refname, 0);
o = deref_tag_noverify(o);
if (o)
packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname_nons);
}