mirror of
https://github.com/git/git.git
synced 2024-11-29 04:54:56 +08:00
Merge branch 'maint'
* maint: xdiff: optimise for no whitespace difference when ignoring whitespace.
This commit is contained in:
commit
5b5275f6e9
@ -190,8 +190,10 @@ int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
|
||||
{
|
||||
int i1, i2;
|
||||
|
||||
if (s1 == s2 && !memcmp(l1, l2, s1))
|
||||
return 1;
|
||||
if (!(flags & XDF_WHITESPACE_FLAGS))
|
||||
return s1 == s2 && !memcmp(l1, l2, s1);
|
||||
return 0;
|
||||
|
||||
i1 = 0;
|
||||
i2 = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user