Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
pickaxe: give diff_grep the same signature as has_changes
author
René Scharfe
<rene.scharfe@lsrfire.ath.cx>
Thu, 6 Oct 2011 16:50:18 +0000
(18:50 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 7 Oct 2011 22:46:14 +0000
(15:46 -0700)
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>
diffcore-pickaxe.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
5d176fb
)
diff --git
a/diffcore-pickaxe.c
b/diffcore-pickaxe.c
index 4d66ba9b7139c5ca88ac1a34be35ccc78adce8a1..226fa0c5ac6bf72d8b82cf0a9d3ac926b7338549 100644
(file)
--- 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;
{
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];
/* 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,
®ex, o
))
+ if (diff_grep(p,
o, ®ex, NULL
))
goto out; /* do not munge the queue */
}
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];
/* 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,
®ex, o
))
+ if (diff_grep(p,
o, ®ex, NULL
))
diff_q(&outq, p);
else
diff_free_filepair(p);
diff_q(&outq, p);
else
diff_free_filepair(p);