diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2015-11-10 02:22:28 +0000 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2015-11-20 08:02:05 -0500 |
| commit | f2fd0760f62e79609fef7bfd7ecebb002e8e4ced (patch) | |
| tree | 1f915114b015428730e95a89697783560b672008 /ref-filter.c | |
| parent | 7999b2cf772956466baa8925491d6fb1b0963292 (diff) | |
| download | git-f2fd0760f62e79609fef7bfd7ecebb002e8e4ced.tar.gz git-f2fd0760f62e79609fef7bfd7ecebb002e8e4ced.tar.xz | |
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 <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ref-filter.c b/ref-filter.c index 25a82a46b..2850c3118 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -394,7 +394,7 @@ static void grab_tag_values(struct atom_value *val, int deref, struct object *ob else if (!strcmp(name, "type") && tag->tagged) v->s = typename(tag->tagged->type); else if (!strcmp(name, "object") && tag->tagged) - v->s = xstrdup(sha1_to_hex(tag->tagged->sha1)); + v->s = xstrdup(oid_to_hex(&tag->tagged->oid)); } } @@ -412,7 +412,7 @@ static void grab_commit_values(struct atom_value *val, int deref, struct object if (deref) name++; if (!strcmp(name, "tree")) { - v->s = xstrdup(sha1_to_hex(commit->tree->object.sha1)); + v->s = xstrdup(oid_to_hex(&commit->tree->object.oid)); } else if (!strcmp(name, "numparent")) { v->ul = commit_list_count(commit->parents); @@ -425,7 +425,7 @@ static void grab_commit_values(struct atom_value *val, int deref, struct object struct commit *parent = parents->item; if (parents != commit->parents) strbuf_addch(&s, ' '); - strbuf_addstr(&s, sha1_to_hex(parent->object.sha1)); + strbuf_addstr(&s, oid_to_hex(&parent->object.oid)); } v->s = strbuf_detach(&s, NULL); } @@ -1049,7 +1049,7 @@ struct contains_stack { static int in_commit_list(const struct commit_list *want, struct commit *c) { for (; want; want = want->next) - if (!hashcmp(want->item->object.sha1, c->object.sha1)) + if (!oidcmp(&want->item->object.oid, &c->object.oid)) return 1; return 0; } |