diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2015-11-10 02:22:27 +0000 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2015-11-20 08:02:05 -0500 |
| commit | 7999b2cf772956466baa8925491d6fb1b0963292 (patch) | |
| tree | 34a3bf75c3cdc621d732107f53181ff28c0550a4 /tree.c | |
| parent | 3c4270107fec2c1d85b7b1a6f8b0aeebf3193b28 (diff) | |
| download | git-7999b2cf772956466baa8925491d6fb1b0963292.tar.gz | |
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 <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'tree.c')
| -rw-r--r-- | tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -102,7 +102,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base, sha1_to_hex(entry.sha1), base->buf, entry.path); - hashcpy(sha1, commit->tree->object.sha1); + hashcpy(sha1, get_object_hash(commit->tree->object)); } else continue; @@ -212,7 +212,7 @@ int parse_tree_gently(struct tree *item, int quiet_on_missing) if (item->object.parsed) return 0; - buffer = read_sha1_file(item->object.sha1, &type, &size); + buffer = read_sha1_file(get_object_hash(item->object), &type, &size); if (!buffer) return quiet_on_missing ? -1 : error("Could not read %s", |