diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-23 14:29:19 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-23 14:29:19 +0900 |
| commit | ca7b2ab07da7551a16f1eed49ade21aa5334021b (patch) | |
| tree | 617e8174b9dbdb8218e6ad28156a91ff4d234e01 /list-objects.c | |
| parent | 1eb437020a2c098a7c12da4c05082fbea10d98c9 (diff) | |
| parent | c251c83df276dc0bff4d008433268ad59b7a8df2 (diff) | |
| download | git-ca7b2ab07da7551a16f1eed49ade21aa5334021b.tar.xz | |
Merge branch 'bc/object-id'
* bc/object-id: (53 commits)
object: convert parse_object* to take struct object_id
tree: convert parse_tree_indirect to struct object_id
sequencer: convert do_recursive_merge to struct object_id
diff-lib: convert do_diff_cache to struct object_id
builtin/ls-tree: convert to struct object_id
merge: convert checkout_fast_forward to struct object_id
sequencer: convert fast_forward_to to struct object_id
builtin/ls-files: convert overlay_tree_on_cache to object_id
builtin/read-tree: convert to struct object_id
sha1_name: convert internals of peel_onion to object_id
upload-pack: convert remaining parse_object callers to object_id
revision: convert remaining parse_object callers to object_id
revision: rename add_pending_sha1 to add_pending_oid
http-push: convert process_ls_object and descendants to object_id
refs/files-backend: convert many internals to struct object_id
refs: convert struct ref_update to use struct object_id
ref-filter: convert some static functions to struct object_id
Convert struct ref_array_item to struct object_id
Convert the verify_pack callback to struct object_id
Convert lookup_tag to struct object_id
...
Diffstat (limited to 'list-objects.c')
| -rw-r--r-- | list-objects.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/list-objects.c b/list-objects.c index f3ca6aafb7..b3931fa434 100644 --- a/list-objects.c +++ b/list-objects.c @@ -110,7 +110,7 @@ static void process_tree(struct rev_info *revs, if (S_ISDIR(entry.mode)) process_tree(revs, - lookup_tree(entry.oid->hash), + lookup_tree(entry.oid), show, base, entry.path, cb_data); else if (S_ISGITLINK(entry.mode)) @@ -119,7 +119,7 @@ static void process_tree(struct rev_info *revs, cb_data); else process_blob(revs, - lookup_blob(entry.oid->hash), + lookup_blob(entry.oid), show, base, entry.path, cb_data); } |