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 /builtin/rm.c | |
| parent | Git 2.10 (diff) | |
| download | tgif-99d1a9861ae88595e7386c453b6b38573a8a570c.tar.xz | |
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 'builtin/rm.c')
| -rw-r--r-- | builtin/rm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rm.c b/builtin/rm.c index b2fee3e90a..109969d514 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -199,7 +199,7 @@ static int check_local_mod(unsigned char *head, int index_only) if (no_head || get_tree_entry(head, name, sha1, &mode) || ce->ce_mode != create_ce_mode(mode) - || hashcmp(ce->sha1, sha1)) + || hashcmp(ce->oid.hash, sha1)) staged_changes = 1; /* |