diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 03:27:51 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 17:23:50 +0100 |
commit | 916bc35b29af6e0f4f215dea9c84e4185de0fec4 (patch) | |
tree | 21f8318b909c7dc21129bad02d6adc7d46fbc705 /blame.c | |
parent | streaming: convert istream internals to struct object_id (diff) | |
download | git-916bc35b29af6e0f4f215dea9c84e4185de0fec4.tar.xz git-916bc35b29af6e0f4f215dea9c84e4185de0fec4.zip |
tree-walk: convert tree entry functions to object_id
Convert get_tree_entry and find_tree_entry to take pointers to struct
object_id.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'blame.c')
-rw-r--r-- | blame.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -80,7 +80,7 @@ static void verify_working_tree_path(struct commit *work_tree, const char *path) struct object_id blob_oid; unsigned mode; - if (!get_tree_entry(commit_oid->hash, path, blob_oid.hash, &mode) && + if (!get_tree_entry(commit_oid, path, &blob_oid, &mode) && oid_object_info(&blob_oid, NULL) == OBJ_BLOB) return; } @@ -502,9 +502,7 @@ static int fill_blob_sha1_and_mode(struct blame_origin *origin) { if (!is_null_oid(&origin->blob_oid)) return 0; - if (get_tree_entry(origin->commit->object.oid.hash, - origin->path, - origin->blob_oid.hash, &origin->mode)) + if (get_tree_entry(&origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode)) goto error_out; if (oid_object_info(&origin->blob_oid, NULL) != OBJ_BLOB) goto error_out; |