diff options
| author |   Junio C Hamano <gitster@pobox.com> | 2019-01-29 12:47:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-29 12:47:56 -0800 |
| commit | 371820d5f1bb3c3e691ad21cee652c02c36ea758 (patch) | |
| tree | ad479bc8fd4e4c59c93807fe47355ef6fccf68e5 /packfile.c | |
| parent | Merge branch 'jt/upload-pack-deepen-relative-proto-v2' (diff) | |
| parent | cache: make oidcpy always copy GIT_MAX_RAWSZ bytes (diff) | |
| download | git-371820d5f1bb3c3e691ad21cee652c02c36ea758.tar.xz git-371820d5f1bb3c3e691ad21cee652c02c36ea758.zip | |
Merge branch 'bc/tree-walk-oid'
The code to walk tree objects has been taught that we may be
working with object names that are not computed with SHA-1.
* bc/tree-walk-oid:
cache: make oidcpy always copy GIT_MAX_RAWSZ bytes
tree-walk: store object_id in a separate member
match-trees: use hashcpy to splice trees
match-trees: compute buffer offset correctly when splicing
tree-walk: copy object ID before use
Diffstat (limited to 'packfile.c')
| -rw-r--r-- | packfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packfile.c b/packfile.c index 0fe9c21bf10..ac6bb64bc39 100644 --- a/packfile.c +++ b/packfile.c @@ -2097,7 +2097,7 @@ static int add_promisor_object(const struct object_id *oid, */ return 0; while (tree_entry_gently(&desc, &entry)) - oidset_insert(set, entry.oid); + oidset_insert(set, &entry.oid); } else if (obj->type == OBJ_COMMIT) { struct commit *commit = (struct commit *) obj; struct commit_list *parents = commit->parents; |