delta/git.git, branch bc/cocci-object-id

merge-recursive: convert merge_recursive_generic to object_id

2016-06-07T02:31:05+00:00

Convert this function and the git merge-recursive subcommand to use
struct object_id.

Signed-off-by: brian m. carlson 
Signed-off-by: Junio C Hamano

merge-recursive: convert leaf functions to use struct object_id

2016-06-07T02:31:05+00:00

Convert all but two of the static functions in this file to use struct
object_id.

Signed-off-by: brian m. carlson 
Signed-off-by: Junio C Hamano

merge-recursive: convert struct merge_file_info to object_id

2016-06-07T02:31:04+00:00

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 standard.cocci:

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

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

Signed-off-by: brian m. carlson 
Signed-off-by: Junio C Hamano

merge-recursive: convert struct stage_data to use object_id

2016-06-07T02:31:04+00:00

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 standard.cocci:

@@
struct stage_data *p;
expression E1;
@@
- p->stages[E1].sha
+ p->stages[E1].oid.hash

@@
struct stage_data o;
expression E1;
@@
- o.stages[E1].sha
+ o.stages[E1].oid.hash

Signed-off-by: brian m. carlson 
Signed-off-by: Junio C Hamano

Rename struct diff_filespec's sha1_valid member.

2016-06-07T02:31:04+00:00

Now that this struct's sha1 member is called "oid", update the comment
and the sha1_valid member to be called "oid_valid" instead.  The
following Coccinelle semantic patch was used to implement this, followed
by the transformations in standard.cocci:

@@
struct diff_filespec *p;
@@
- p->sha1_valid
+ p->oid_valid

@@
struct diff_filespec o;
@@
- o.sha1_valid
+ o.oid_valid

Signed-off-by: brian m. carlson 
Signed-off-by: Junio C Hamano

Convert struct diff_filespec to struct object_id

2016-06-07T02:31:04+00:00

Convert struct diff_filespec's sha1 member to use a struct object_id
called "oid" instead.  The following Coccinelle semantic patch was used
to implement this, followed by the transformations in standard.cocci:

@@
struct diff_filespec *p;
@@
- p->sha1
+ p->oid.hash

@@
struct diff_filespec o;
@@
- o.sha1
+ o.oid.hash

Signed-off-by: brian m. carlson 
Signed-off-by: Junio C Hamano

Apply standard object_id Coccinelle transformations.

2016-06-07T02:31:04+00:00

Apply the standard set of semantic patches to convert some leftover
places using struct object_id's hash member to instead use the wrapper
functions that take struct object_id natively.

Signed-off-by: brian m. carlson 
Signed-off-by: Junio C Hamano

Add basic Coccinelle transforms.

2016-06-07T02:31:04+00:00

Coccinelle (http://coccinelle.lip6.fr/) is a program which performs
mechanical transformations on C programs using semantic patches.  These
semantic patches can be used to implement automatic refactoring and
maintenance tasks.

Add a set of basic semantic patches to convert common patterns related
to the struct object_id transformation.

Signed-off-by: brian m. carlson 
Signed-off-by: Junio C Hamano

Git 2.9-rc1

2016-05-31T21:12:15+00:00

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2016-05-31T21:12:08+00:00

* maint:
  More topics for 2.8.4