From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Jul 2010 06:33:07 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2-rc2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5b5275f6e9ca6284ca123f729d5a78f409e448fb?hp=869d58813b24c74e84c9388041eafcef40cb51e4

Merge branch 'maint'

* maint:
xdiff: optimise for no whitespace difference when ignoring whitespace.
---

diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index bc12f29895..22f9bd692c 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -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;