mirror of
https://github.com/git/git.git
synced 2024-09-28 18:32:37 +02:00
upload-pack: drop lookup-before-parse optimization
When we receive a "have" line from the client, we want to load the object pointed to by the sha1. However, we are careful to do: o = lookup_object(sha1); if (!o || !o->parsed) o = parse_object(sha1); to avoid loading the object from disk if we have already seen it. However, since ccdc603 (parse_object: try internal cache before reading object db), parse_object already does this optimization internally. We can just call parse_object directly. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
435c833237
commit
a6eec12638
@ -327,9 +327,7 @@ static int got_sha1(char *hex, unsigned char *sha1)
|
||||
if (!has_sha1_file(sha1))
|
||||
return -1;
|
||||
|
||||
o = lookup_object(sha1);
|
||||
if (!(o && o->parsed))
|
||||
o = parse_object(sha1);
|
||||
o = parse_object(sha1);
|
||||
if (!o)
|
||||
die("oops (%s)", sha1_to_hex(sha1));
|
||||
if (o->type == OBJ_COMMIT) {
|
||||
|
Loading…
Reference in New Issue
Block a user