diff options
| author | Jeff King <peff@peff.net> | 2014-07-13 02:42:17 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-28 10:14:34 -0700 |
| commit | b794ebeac9151af4a9136ef28a22a06c2afb17cc (patch) | |
| tree | 6ca634eb0048e97f868992642169b9e1cd99f387 | |
| parent | 34dfe197a93763ec9c5d25eec499777cbb32b6fd (diff) | |
| download | git-b794ebeac9151af4a9136ef28a22a06c2afb17cc.tar.gz | |
diff-tree: avoid lookup_unknown_objectjk/alloc-commit-id-maint
We generally want to avoid lookup_unknown_object, because it
results in allocating more memory for the object than may be
strictly necessary.
In this case, it is used to check whether we have an
already-parsed object before calling parse_object, to save
us from reading the object from disk. Using lookup_object
would be fine for that purpose, but we can take it a step
further. Since this code was written, parse_object already
learned the "check lookup_object" optimization, so we can
simply call parse_object directly.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/diff-tree.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index be6417d166..dddd0f9188 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -72,9 +72,7 @@ static int diff_tree_stdin(char *line) line[len-1] = 0; if (get_sha1_hex(line, sha1)) return -1; - obj = lookup_unknown_object(sha1); - if (!obj || !obj->parsed) - obj = parse_object(sha1); + obj = parse_object(sha1); if (!obj) return -1; if (obj->type == OBJ_COMMIT) |