From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Nov 2010 18:39:08 +0000 (-0700)
Subject: Merge branch 'cb/diff-fname-optim' into next
X-Git-Tag: ko-next~161
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b3b09f3fb7d308f8084169a15f1dead3fe8ff3ab;p=git.git

Merge branch 'cb/diff-fname-optim' into next

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

b3b09f3fb7d308f8084169a15f1dead3fe8ff3ab
diff --cc diff.c
index 154d3acd0,6dbb4b40f..7ab9b5d85
--- 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);
  	}