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>
This commit is contained in:
parent
5d176fb6b6
commit
db99cb7000
@ -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, ®ex, o))
|
||||
if (diff_grep(p, o, ®ex, 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, ®ex, o))
|
||||
if (diff_grep(p, o, ®ex, NULL))
|
||||
diff_q(&outq, p);
|
||||
else
|
||||
diff_free_filepair(p);
|
||||
|
Loading…
Reference in New Issue
Block a user