diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2016-06-24 23:09:26 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-28 11:39:02 -0700 |
| commit | 9b561499963d3f8b9ad15f5eae667ec5558f5af1 (patch) | |
| tree | a1a02a5acc2fe9e6dda99f39166b115507e1642c /xdiff | |
| parent | fd429e986de0fd380b63c0a1949b72ef076f58cc (diff) | |
| download | git-9b561499963d3f8b9ad15f5eae667ec5558f5af1.tar.gz git-9b561499963d3f8b9ad15f5eae667ec5558f5af1.tar.xz | |
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>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions