When we are looking at an event that creates (or removes) a path, we only
need to see if the created (or removed) blob has an instance of the needle
we are looking for. There is no need to count, once we know there is one.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
diffcore-pickaxe.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index d27e725..007b39c 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -5,7 +5,8 @@
#include "diff.h"
#include "diffcore.h"
-static unsigned int count_match(struct diff_filespec *one,
+static unsigned int count_match(int one_or_more,
+ struct diff_filespec *one,
const char *needle, unsigned long len,
regex_t *regexp)
{
@@ -30,6 +31,8 @@ static unsigned int count_match(struct diff_filespec *one,
data += regmatch.rm_so;
if (*data) data++;
cnt++;
+ if (one_or_more)
+ break;
}
} else { /* Classic exact string match */
@@ -41,6 +44,8 @@ static unsigned int count_match(struct diff_filespec *one,
if (!memcmp(needle, data + offset, len)) {
offset += len - 1;
cnt++;
+ if (one_or_more)
+ break;
}
}
}
@@ -52,15 +57,15 @@ static int has_match(struct diff_filespec *one,
const char *needle, unsigned long len,
regex_t *regexp)
{
- return !!count_match(one, needle, len, regexp);
+ return count_match(1, one, needle, len, regexp);
}
static int has_different_matches(struct diff_filepair *p,
const char *needle, unsigned long len,
regex_t *regexp)
{
- return (count_match(p->one, needle, len, regexp)
- != count_match(p->two, needle, len, regexp));
+ return (count_match(0, p->one, needle, len, regexp)
+ != count_match(0, p->two, needle, len, regexp));
}
--
1.6.2.rc2.91.gf9a36
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
