diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2015-11-10 03:22:27 +0100 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2015-11-20 14:02:05 +0100 |
| commit | 7999b2cf772956466baa8925491d6fb1b0963292 (patch) | |
| tree | 34a3bf75c3cdc621d732107f53181ff28c0550a4 /wt-status.c | |
| parent | object: introduce get_object_hash macro. (diff) | |
| download | git-7999b2cf772956466baa8925491d6fb1b0963292.tar.xz git-7999b2cf772956466baa8925491d6fb1b0963292.zip | |
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 'wt-status.c')
| -rw-r--r-- | wt-status.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c index 435fc2806e..0b5c1632b2 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1347,7 +1347,7 @@ static void wt_status_get_detached_from(struct wt_status_state *state) (!hashcmp(cb.nsha1, sha1) || /* perhaps sha1 is a tag, try to dereference to a commit */ ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL && - !hashcmp(cb.nsha1, commit->object.sha1)))) { + !hashcmp(cb.nsha1, get_object_hash(commit->object))))) { const char *from = ref; if (!skip_prefix(from, "refs/tags/", &from)) skip_prefix(from, "refs/remotes/", &from); |