[PATCH 1/3] upload-pack: drop lookup-before-parse optimization
- From
Jeff King <peff@peff.net>
- Date
- Mar 16, 2013, 10:25 UTC
- Message-ID
- <20130316102525.GA29533@sigill.intra.peff.net>
- In-Reply-To
- <20130316102428.GA29358@sigill.intra.peff.net>
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> --- upload-pack.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c index 30146a0..6bf81aa 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -325,9 +325,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) {
-- 1.8.2.rc2.7.gef06216