From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Jul 2013 19:04:17 +0000 (-0700)
Subject: Merge branch 'rs/pickaxe-simplify'
X-Git-Tag: v1.8.4-rc0~62
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d5a3897f94dc4a2a77f30eeaf39cf14468061d0d?ds=inline;hp=-c

Merge branch 'rs/pickaxe-simplify'

* rs/pickaxe-simplify:
diffcore-pickaxe: simplify has_changes and contains
---

d5a3897f94dc4a2a77f30eeaf39cf14468061d0d
diff --combined diffcore-pickaxe.c
index c97ac9b463,0846fa7461..401eb72c61
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@@ -122,7 -122,7 +122,7 @@@ static void diffcore_pickaxe_grep(struc
  		char errbuf[1024];
  		regerror(err, &regex, errbuf, 1024);
  		regfree(&regex);
 -		die("invalid log-grep regex: %s", errbuf);
 +		die("invalid regex: %s", errbuf);
  	}
  
  	pickaxe(&diff_queued_diff, o, &regex, NULL, diff_grep);
@@@ -131,8 -131,7 +131,7 @@@
  	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 +175,9 @@@ static int has_changes(mmfile_t *one, m
  		       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,
@@@ -246,7 -243,7 +243,7 @@@ static void diffcore_pickaxe_count(stru
  			char errbuf[1024];
  			regerror(err, &regex, errbuf, 1024);
  			regfree(&regex);
 -			die("invalid pickaxe regex: %s", errbuf);
 +			die("invalid regex: %s", errbuf);
  		}
  		regexp = &regex;
  	} else {