From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Nov 2010 22:59:16 +0000 (-0800)
Subject: Merge branch 'cb/diff-fname-optim'
X-Git-Tag: v1.7.4-rc0~146
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8cf666c9eea7d6c40784efde545c9d00edea1959;p=git.git

Merge branch 'cb/diff-fname-optim'

* cb/diff-fname-optim:
  diff: avoid repeated scanning while looking for funcname
  do not search functions for patch ID
  add rebase patch id tests
---

8cf666c9eea7d6c40784efde545c9d00edea1959
diff --cc diff.c
index c8e43664f,6dbb4b40f..c248bc64c
--- a/diff.c
+++ b/diff.c
@@@ -3885,16 -3766,9 +3885,16 @@@ static int diff_get_patch_id(struct dif
  					len2, p->two->path);
  		git_SHA1_Update(&ctx, buffer, len1);
  
 +		if (diff_filespec_is_binary(p->one) ||
 +		    diff_filespec_is_binary(p->two)) {
 +			git_SHA1_Update(&ctx, sha1_to_hex(p->one->sha1), 40);
 +			git_SHA1_Update(&ctx, sha1_to_hex(p->two->sha1), 40);
 +			continue;
 +		}
 +
  		xpp.flags = 0;
  		xecfg.ctxlen = 3;
- 		xecfg.flags = XDL_EMIT_FUNCNAMES;
+ 		xecfg.flags = 0;
  		xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data,
  			      &xpp, &xecfg);
  	}