diff options
| author | Jeff King <peff@peff.net> | 2013-03-16 10:25:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-17 05:16:45 (GMT) |
| commit | a6eec1263883ce9787a354e1635b7b732e72c3c9 (patch) | |
| tree | 9f59547733de1d18bc41d04e09ecdb98a942c47f /upload-pack.c | |
| parent | 435c83323713066723e4194cd89c31bbec7011a2 (diff) | |
| download | git-a6eec1263883ce9787a354e1635b7b732e72c3c9.zip git-a6eec1263883ce9787a354e1635b7b732e72c3c9.tar.gz git-a6eec1263883ce9787a354e1635b7b732e72c3c9.tar.bz2 | |
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>
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/upload-pack.c b/upload-pack.c index 6142421..e29d5d2 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -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) { |