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 /diff-lib.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 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-lib.c b/diff-lib.c index 241a8435eb..409c8b34ba 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -493,7 +493,7 @@ int run_diff_index(struct rev_info *revs, int cached) struct object_array_entry *ent; ent = revs->pending.objects; - if (diff_cache(revs, ent->item->sha1, ent->name, cached)) + if (diff_cache(revs, get_object_hash(*ent->item), ent->name, cached)) exit(128); diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/"); |