merge-recursive: convert struct merge_file_info to object_id
authorbrian m. carlson <sandals@crustytoothpaste.net>
Fri, 24 Jun 2016 23:09:26 +0000 (23:09 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Jun 2016 18:39:02 +0000 (11:39 -0700)
commit9b561499963d3f8b9ad15f5eae667ec5558f5af1
treea1a02a5acc2fe9e6dda99f39166b115507e1642c
parentfd429e986de0fd380b63c0a1949b72ef076f58cc
merge-recursive: convert struct merge_file_info to object_id

Convert struct merge_file_info to use struct object_id.  The following
Coccinelle semantic patch was used to implement this, followed by the
transformations in object_id.cocci:

@@
struct merge_file_info o;
@@
- o.sha
+ o.oid.hash

@@
struct merge_file_info *p;
@@
- p->sha
+ p->oid.hash

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c