diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2016-09-05 20:07:52 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-09-07 12:59:42 -0700 |
commit | 99d1a9861ae88595e7386c453b6b38573a8a570c (patch) | |
tree | 670664666d85bb83d7d80b83904c25adb5b7029a /diff.c | |
parent | 6ebdac1bab966b720d776aa43ca188fe378b1f4b (diff) | |
download | git-99d1a9861ae88595e7386c453b6b38573a8a570c.tar.gz |
cache: convert struct cache_entry to use struct object_id
Convert struct cache_entry to use struct object_id by applying the
following semantic patch and the object_id transforms from contrib, plus
the actual change to the struct:
@@
struct cache_entry E1;
@@
- E1.sha1
+ E1.oid.hash
@@
struct cache_entry *E1;
@@
- E1->sha1
+ E1->oid.hash
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2700,7 +2700,7 @@ static int reuse_worktree_file(const char *name, const unsigned char *sha1, int * This is not the sha1 we are looking for, or * unreusable because it is not a regular file. */ - if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode)) + if (hashcmp(sha1, ce->oid.hash) || !S_ISREG(ce->ce_mode)) return 0; /* |