Merge branch 'bc/cocci'

Conversion from unsigned char sha1[20] to struct object_id
continues.

* bc/cocci:
  diff: convert prep_temp_blob() to struct object_id
  merge-recursive: convert merge_recursive_generic() to object_id
  merge-recursive: convert leaf functions to use struct object_id
  merge-recursive: convert struct merge_file_info to object_id
  merge-recursive: convert struct stage_data to use object_id
  diff: rename struct diff_filespec's sha1_valid member
  diff: convert struct diff_filespec to struct object_id
  coccinelle: apply object_id Coccinelle transformations
  coccinelle: convert hashcpy() with null_sha1 to hashclr()
  contrib/coccinelle: add basic Coccinelle transforms
  hex: add oid_to_hex_r()

diff --cc bisect.c
index b2a75c60cfb292f750a69af900aada69cabb6fa6,ff147589c7f4520f8f9f9a228fb4952d84da9693..47cccdfb0dae4a4a4bc09461c00f0d46db9c3c81
--- 1/bisect.c
--- 2/bisect.c
+++ b/bisect.c
@@@ -754,10 -754,10 +754,10 @@@ static void handle_bad_merge_base(void
  static void handle_skipped_merge_base(const unsigned char *mb)
  {
        char *mb_hex = sha1_to_hex(mb);
-       char *bad_hex = sha1_to_hex(current_bad_oid->hash);
+       char *bad_hex = oid_to_hex(current_bad_oid);
        char *good_hex = join_sha1_array_hex(&good_revs, ' ');
  
 -      warning("the merge base between %s and [%s] "
 +      warning(_("the merge base between %s and [%s] "
                "must be skipped.\n"
                "So we cannot be sure the first %s commit is "
                "between %s and %s.\n"

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/merge.c
Simple merge

diff --cc builtin/reset.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc combine-diff.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc line-log.c
index a30c89a30966cda66f55f294b986049fdfeed34e,93407baafd12c68aedb04bc6995417d9554aef78..916e7248701dad2a8beb870887a5ed7d3874ff41
--- 1/line-log.c
--- 2/line-log.c
+++ b/line-log.c
@@@ -897,12 -898,12 +897,12 @@@ static void dump_diff_hacky_one(struct 
                fill_line_ends(pair->one, &p_lines, &p_ends);
        fill_line_ends(pair->two, &t_lines, &t_ends);
  
 -      printf("%s%sdiff --git a/%s b/%s%s\n", prefix, c_meta, pair->one->path, pair->two->path, c_reset);
 -      printf("%s%s--- %s%s%s\n", prefix, c_meta,
 +      fprintf(opt->file, "%s%sdiff --git a/%s b/%s%s\n", prefix, c_meta, pair->one->path, pair->two->path, c_reset);
 +      fprintf(opt->file, "%s%s--- %s%s%s\n", prefix, c_meta,
-              pair->one->sha1_valid ? "a/" : "",
-              pair->one->sha1_valid ? pair->one->path : "/dev/null",
+              pair->one->oid_valid ? "a/" : "",
+              pair->one->oid_valid ? pair->one->path : "/dev/null",
               c_reset);
 -      printf("%s%s+++ b/%s%s\n", prefix, c_meta, pair->two->path, c_reset);
 +      fprintf(opt->file, "%s%s+++ b/%s%s\n", prefix, c_meta, pair->two->path, c_reset);
        for (i = 0; i < range->ranges.nr; i++) {
                long p_start, p_end;
                long t_start = range->ranges.ranges[i].start;

diff --cc notes-merge.c
Simple merge

diff --cc submodule-config.c
Simple merge

diff --cc submodule.c
Simple merge

diff --cc wt-status.c
Simple merge