Permalink
Browse files

Merge branch 'rs/pickaxe-simplify'

* rs/pickaxe-simplify:
  diffcore-pickaxe: simplify has_changes and contains
  • Loading branch information...
2 parents 533a05f + 3bdb5b9 commit d5a3897f94dc4a2a77f30eeaf39cf14468061d0d @gitster gitster committed Jul 12, 2013
Showing with 4 additions and 7 deletions.
  1. +4 −7 diffcore-pickaxe.c
View
@@ -131,8 +131,7 @@ static void diffcore_pickaxe_grep(struct diff_options *o)
return;
}
-static unsigned int contains(mmfile_t *mf, struct diff_options *o,
- regex_t *regexp, kwset_t kws)
+static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws)
{
unsigned int cnt;
unsigned long sz;
@@ -176,11 +175,9 @@ static int has_changes(mmfile_t *one, mmfile_t *two,
struct diff_options *o,
regex_t *regexp, kwset_t kws)
{
- if (!one)
- return contains(two, o, regexp, kws) != 0;
- if (!two)
- return contains(one, o, regexp, kws) != 0;
- return contains(one, o, regexp, kws) != contains(two, o, regexp, kws);
+ unsigned int one_contains = one ? contains(one, regexp, kws) : 0;
+ unsigned int two_contains = two ? contains(two, regexp, kws) : 0;
+ return one_contains != two_contains;
}
static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,

0 comments on commit d5a3897

Please sign in to comment.