diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2015-11-10 02:22:29 +0000 |
|---|---|---|
| committer |  Jeff King <peff@peff.net> | 2015-11-20 08:02:05 -0500 |
| commit | ed1c9977cb1b63e4270ad8bdf967a2d02580aa08 (patch) | |
| tree | f5b52ccae09103672c62c1c11ff0bddc78199829 /builtin/merge-tree.c | |
| parent | Convert struct object to object_id (diff) | |
| download | tgif-ed1c9977cb1b63e4270ad8bdf967a2d02580aa08.tar.xz | |
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 <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'builtin/merge-tree.c')
| -rw-r--r-- | builtin/merge-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index e124886ef1..d4f0cbd451 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -60,7 +60,7 @@ static void *result(struct merge_list *entry, unsigned long *size) const char *path = entry->path; if (!entry->stage) - return read_sha1_file(get_object_hash(entry->blob->object), &type, size); + return read_sha1_file(entry->blob->object.oid.hash, &type, size); base = NULL; if (entry->stage == 1) { base = entry->blob; @@ -82,7 +82,7 @@ static void *origin(struct merge_list *entry, unsigned long *size) enum object_type type; while (entry) { if (entry->stage == 2) - return read_sha1_file(get_object_hash(entry->blob->object), &type, size); + return read_sha1_file(entry->blob->object.oid.hash, &type, size); entry = entry->link; } return NULL; |