From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Jun 2010 18:16:57 +0000 (-0700)
Subject: Merge branch 'cc/maint-diff-CC-binary'
X-Git-Tag: v1.7.2-rc0~43
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5977744d045cacb809a3e3630dbbd28fe83976ae;p=git.git

Merge branch 'cc/maint-diff-CC-binary'

* cc/maint-diff-CC-binary:
  diff: fix "git show -C -C" output when renaming a binary file

Conflicts:
	diff.c
---

5977744d045cacb809a3e3630dbbd28fe83976ae
diff --cc diff.c
index c6b5fb376,426fd0466..2327cea5b
--- a/diff.c
+++ b/diff.c
@@@ -1890,25 -1642,28 +1891,28 @@@ static void builtin_diff(const char *na
  	b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
  	lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
  	lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
 -	strbuf_addf(&header, "%sdiff --git %s %s%s\n", set, a_one, b_two, reset);
 +	strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, set, a_one, b_two, reset);
  	if (lbl[0][0] == '/') {
  		/* /dev/null */
 -		strbuf_addf(&header, "%snew file mode %06o%s\n", set, two->mode, reset);
 -		if (xfrm_msg && xfrm_msg[0])
 -			strbuf_addf(&header, "%s%s%s\n", set, xfrm_msg, reset);
 +		strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, set, two->mode, reset);
 +		if (xfrm_msg)
 +			strbuf_addstr(&header, xfrm_msg);
+ 		must_show_header = 1;
  	}
  	else if (lbl[1][0] == '/') {
 -		strbuf_addf(&header, "%sdeleted file mode %06o%s\n", set, one->mode, reset);
 -		if (xfrm_msg && xfrm_msg[0])
 -			strbuf_addf(&header, "%s%s%s\n", set, xfrm_msg, reset);
 +		strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, set, one->mode, reset);
 +		if (xfrm_msg)
 +			strbuf_addstr(&header, xfrm_msg);
+ 		must_show_header = 1;
  	}
  	else {
  		if (one->mode != two->mode) {
 -			strbuf_addf(&header, "%sold mode %06o%s\n", set, one->mode, reset);
 -			strbuf_addf(&header, "%snew mode %06o%s\n", set, two->mode, reset);
 +			strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, set, one->mode, reset);
 +			strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, set, two->mode, reset);
+ 			must_show_header = 1;
  		}
 -		if (xfrm_msg && xfrm_msg[0])
 -			strbuf_addf(&header, "%s%s%s\n", set, xfrm_msg, reset);
 +		if (xfrm_msg)
 +			strbuf_addstr(&header, xfrm_msg);
  
  		/*
  		 * we do not run diff between different kind
@@@ -1928,15 -1683,19 +1932,18 @@@
  		}
  	}
  
 -	if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
 -		die("unable to read files to diff");
 -
  	if (!DIFF_OPT_TST(o, TEXT) &&
 -	    ( (diff_filespec_is_binary(one) && !textconv_one) ||
 -	      (diff_filespec_is_binary(two) && !textconv_two) )) {
 +	    ( (!textconv_one && diff_filespec_is_binary(one)) ||
 +	      (!textconv_two && diff_filespec_is_binary(two)) )) {
 +		if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
 +			die("unable to read files to diff");
  		/* Quite common confusing case */
  		if (mf1.size == mf2.size &&
- 		    !memcmp(mf1.ptr, mf2.ptr, mf1.size))
+ 		    !memcmp(mf1.ptr, mf2.ptr, mf1.size)) {
+ 			if (must_show_header)
+ 				fprintf(o->file, "%s", header.buf);
  			goto free_ab_and_return;
+ 		}
  		fprintf(o->file, "%s", header.buf);
  		strbuf_reset(&header);
  		if (DIFF_OPT_TST(o, BINARY))
@@@ -2568,18 -2323,9 +2575,19 @@@ static void fill_metainfo(struct strbu
  			  struct diff_filespec *two,
  			  struct diff_options *o,
  			  struct diff_filepair *p,
 -			  int *must_show_header)
++			  int *must_show_header,
 +			  int use_color)
  {
 +	const char *set = diff_get_color(use_color, DIFF_METAINFO);
 +	const char *reset = diff_get_color(use_color, DIFF_RESET);
 +	struct strbuf *msgbuf;
 +	char *line_prefix = "";
 +
+ 	*must_show_header = 1;
 +	if (o->output_prefix) {
 +		msgbuf = o->output_prefix(o, o->output_prefix_data);
 +		line_prefix = msgbuf->buf;
 +	}
- 
  	strbuf_init(msg, PATH_MAX * 2 + 300);
  	switch (p->status) {
  	case DIFF_STATUS_COPIED:
@@@ -2646,7 -2387,13 +2654,8 @@@ static void run_diff_cmd(const char *pg
  {
  	const char *xfrm_msg = NULL;
  	int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
+ 	int must_show_header = 0;
  
 -	if (msg) {
 -		fill_metainfo(msg, name, other, one, two, o, p, &must_show_header);
 -		xfrm_msg = msg->len ? msg->buf : NULL;
 -	}
 -
  	if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
  		pgm = NULL;
  	else {
@@@ -2655,16 -2402,6 +2664,17 @@@
  			pgm = drv->external;
  	}
  
 +	if (msg) {
 +		/*
 +		 * don't use colors when the header is intended for an
 +		 * external diff driver
 +		 */
 +		fill_metainfo(msg, name, other, one, two, o, p,
++			      &must_show_header,
 +			      DIFF_OPT_TST(o, COLOR_DIFF) && !pgm);
 +		xfrm_msg = msg->len ? msg->buf : NULL;
 +	}
 +
  	if (pgm) {
  		run_external_diff(pgm, name, other, one, two, xfrm_msg,
  				  complete_rewrite);