From 7999b2cf772956466baa8925491d6fb1b0963292 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Tue, 10 Nov 2015 02:22:27 +0000 Subject: Add several uses of get_object_hash. Convert most instances where the sha1 member of struct object is dereferenced to use get_object_hash. Most instances that are passed to functions that have versions taking struct object_id, such as get_sha1_hex/get_oid_hex, or instances that can be trivially converted to use struct object_id instead, are not converted. Signed-off-by: brian m. carlson Signed-off-by: Jeff King --- shallow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shallow.c') diff --git a/shallow.c b/shallow.c index 46be789779..24410db1e4 100644 --- a/shallow.c +++ b/shallow.c @@ -105,7 +105,7 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth, cur_depth++; if ((depth != INFINITE_DEPTH && cur_depth >= depth) || (is_repository_shallow() && !commit->parents && - (graft = lookup_commit_graft(commit->object.sha1)) != NULL && + (graft = lookup_commit_graft(get_object_hash(commit->object))) != NULL && graft->nr_parent < 0)) { commit_list_insert(commit, &result); commit->object.flags |= shallow_flag; -- cgit v1.2.3 From f2fd0760f62e79609fef7bfd7ecebb002e8e4ced Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Tue, 10 Nov 2015 02:22:28 +0000 Subject: Convert struct object to object_id struct object is one of the major data structures dealing with object IDs. Convert it to use struct object_id instead of an unsigned char array. Convert get_object_hash to refer to the new member as well. Signed-off-by: brian m. carlson Signed-off-by: Jeff King --- shallow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'shallow.c') diff --git a/shallow.c b/shallow.c index 24410db1e4..e1f772d78f 100644 --- a/shallow.c +++ b/shallow.c @@ -167,7 +167,7 @@ static int write_one_shallow(const struct commit_graft *graft, void *cb_data) if (!c || !(c->object.flags & SEEN)) { if (data->flags & VERBOSE) printf("Removing %s from .git/shallow\n", - sha1_to_hex(c->object.sha1)); + oid_to_hex(&c->object.oid)); return 0; } } @@ -426,7 +426,7 @@ static void paint_down(struct paint_info *info, const unsigned char *sha1, if (parse_commit(c)) die("unable to parse commit %s", - sha1_to_hex(c->object.sha1)); + oid_to_hex(&c->object.oid)); for (p = c->parents; p; p = p->next) { uint32_t **p_refs = ref_bitmap_at(&info->ref_bitmap, -- cgit v1.2.3 From ed1c9977cb1b63e4270ad8bdf967a2d02580aa08 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Tue, 10 Nov 2015 02:22:29 +0000 Subject: Remove get_object_hash. Convert all instances of get_object_hash to use an appropriate reference to the hash member of the oid member of struct object. This provides no functional change, as it is essentially a macro substitution. Signed-off-by: brian m. carlson Signed-off-by: Jeff King --- shallow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shallow.c') diff --git a/shallow.c b/shallow.c index e1f772d78f..60f1505d97 100644 --- a/shallow.c +++ b/shallow.c @@ -105,7 +105,7 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth, cur_depth++; if ((depth != INFINITE_DEPTH && cur_depth >= depth) || (is_repository_shallow() && !commit->parents && - (graft = lookup_commit_graft(get_object_hash(commit->object))) != NULL && + (graft = lookup_commit_graft(commit->object.oid.hash)) != NULL && graft->nr_parent < 0)) { commit_list_insert(commit, &result); commit->object.flags |= shallow_flag; -- cgit v1.2.3