Merge branch 'maint'

* maint:
  xdiff: optimise for no whitespace difference when ignoring whitespace.
This commit is contained in:
Junio C Hamano 2010-07-05 23:33:07 -07:00
commit 5b5275f6e9

View File

@ -190,8 +190,10 @@ int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
{ {
int i1, i2; int i1, i2;
if (s1 == s2 && !memcmp(l1, l2, s1))
return 1;
if (!(flags & XDF_WHITESPACE_FLAGS)) if (!(flags & XDF_WHITESPACE_FLAGS))
return s1 == s2 && !memcmp(l1, l2, s1); return 0;
i1 = 0; i1 = 0;
i2 = 0; i2 = 0;