summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2011-10-06 18:50:18 +0200
committerJunio C Hamano <gitster@pobox.com>2011-10-07 15:46:14 -0700
commitdb99cb700098942d3fced9e5d8ec873aabe6e1ef (patch)
tree7bd9257ea30c760d657fd6add8ae51b7aec37a9e
parent5d176fb6b6a22f19f7a15fc344dfb08af1e29ed7 (diff)
downloadgit-db99cb700098942d3fced9e5d8ec873aabe6e1ef.tar.gz
pickaxe: give diff_grep the same signature as has_changes
Change diff_grep() to match the signature of has_changes() as a preparation for the next patch that will use function pointers to the two. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--diffcore-pickaxe.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 4d66ba9b71..226fa0c5ac 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -45,7 +45,8 @@ static void fill_one(struct diff_filespec *one,
}
}
-static int diff_grep(struct diff_filepair *p, regex_t *regexp, struct diff_options *o)
+static int diff_grep(struct diff_filepair *p, struct diff_options *o,
+ regex_t *regexp, kwset_t kws)
{
regmatch_t regmatch;
struct userdiff_driver *textconv_one = NULL;
@@ -114,7 +115,7 @@ static void diffcore_pickaxe_grep(struct diff_options *o)
/* Showing the whole changeset if needle exists */
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
- if (diff_grep(p, &regex, o))
+ if (diff_grep(p, o, &regex, NULL))
goto out; /* do not munge the queue */
}
@@ -129,7 +130,7 @@ static void diffcore_pickaxe_grep(struct diff_options *o)
/* Showing only the filepairs that has the needle */
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
- if (diff_grep(p, &regex, o))
+ if (diff_grep(p, o, &regex, NULL))
diff_q(&outq, p);
else
diff_free_filepair(p);