kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
René Scharfe 2011-10-06 18:50:18 +02:00 committed by Junio C Hamano
parent 5d176fb6b6
commit db99cb7000
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
diffcore-pickaxe.c
View File

@ -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; regmatch_t regmatch;
struct userdiff_driver *textconv_one = NULL; 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 */ /* Showing the whole changeset if needle exists */
for (i = 0; i < q->nr; i++) { for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[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 */ 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 */ /* Showing only the filepairs that has the needle */
for (i = 0; i < q->nr; i++) { for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[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); diff_q(&outq, p);
else else
diff_free_filepair(p); diff_free_filepair(p);