From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Jul 2016 20:22:16 +0000 (-0700)
Subject: Merge branch 'bc/cocci'
X-Git-Tag: v2.10.0-rc0~110
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a63d31b4d3640960d9a71606eee80c32459f906e;p=git-core%2Fgit.git

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()
---

a63d31b4d3640960d9a71606eee80c32459f906e
diff --cc bisect.c
index b2a75c60c,ff147589c..47cccdfb0
--- a/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 line-log.c
index a30c89a30,93407baaf..916e72487
--- a/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;