diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-28 10:35:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-28 10:35:35 -0700 |
| commit | 5d7c37a130833d8e612f6b83f017ffe51a1a6833 (patch) | |
| tree | 6ca634eb0048e97f868992642169b9e1cd99f387 /builtin | |
| parent | 740c281d21ef5b27f6f1b942a4f2fc20f51e8c7e (diff) | |
| parent | b794ebeac9151af4a9136ef28a22a06c2afb17cc (diff) | |
| download | git-5d7c37a130833d8e612f6b83f017ffe51a1a6833.tar.gz git-5d7c37a130833d8e612f6b83f017ffe51a1a6833.tar.xz | |
Merge branch 'jk/alloc-commit-id-maint' into maint
* jk/alloc-commit-id-maint:
diff-tree: avoid lookup_unknown_object
object_as_type: set commit index
alloc: factor out commit index
add object_as_type helper for casting objects
parse_object_buffer: do not set object type
move setting of object->type to alloc_* functions
alloc: write out allocator definitions
alloc.c: remove the alloc_raw_commit_node() function
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/blame.c | 1 | ||||
| -rw-r--r-- | builtin/diff-tree.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 6a284ce46..eefd6bc2e 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2041,7 +2041,6 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt, commit = alloc_commit_node(); commit->object.parsed = 1; commit->date = now; - commit->object.type = OBJ_COMMIT; parent_tail = &commit->parents; if (!resolve_ref_unsafe("HEAD", head_sha1, 1, NULL)) diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index be6417d16..dddd0f918 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) |