diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2016-06-24 23:09:25 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-06-28 11:39:02 -0700 |
| commit | fd429e986de0fd380b63c0a1949b72ef076f58cc (patch) | |
| tree | faf5380d15e43cc46bb1b44684ea8488e1ee81a2 /diffcore-pickaxe.c | |
| parent | diff: rename struct diff_filespec's sha1_valid member (diff) | |
| download | tgif-fd429e986de0fd380b63c0a1949b72ef076f58cc.tar.xz | |
merge-recursive: convert struct stage_data to use object_id
Convert the anonymous struct within struct stage_data to use struct
object_id. The following Coccinelle semantic patch was used to
implement this, followed by the transformations in object_id.cocci:
@@
struct stage_data o;
expression E1;
@@
- o.stages[E1].sha
+ o.stages[E1].oid.hash
@@
struct stage_data *p;
expression E1;
@@
- p->stages[E1].sha
+ p->stages[E1].oid.hash
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions