From 8fa4b09fb14339c5d62e65a88fde8b220cb1591b Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sun, 28 Oct 2012 08:34:06 -0400 Subject: [PATCH] pickaxe: hoist empty needle check If we are given an empty pickaxe needle like "git log -S ''", it is impossible for us to find anything (because no matter what the content, the count will always be 0). We currently check this at the lowest level of contains(). Let's hoist the logic much earlier to has_changes(), so that it is simpler to return our answer before loading any blob data. Signed-off-by: Jeff King --- diffcore-pickaxe.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c index a20937635..61f628c28 100644 --- a/diffcore-pickaxe.c +++ b/diffcore-pickaxe.c @@ -163,8 +163,6 @@ static unsigned int contains(struct diff_filespec *one, struct diff_options *o, unsigned int cnt; unsigned long sz; const char *data; - if (!o->pickaxe[0]) - return 0; if (diff_populate_filespec(one, 0)) return 0; @@ -206,6 +204,9 @@ static unsigned int contains(struct diff_filespec *one, struct diff_options *o, static int has_changes(struct diff_filepair *p, struct diff_options *o, regex_t *regexp, kwset_t kws) { + if (!o->pickaxe[0]) + return 0; + if (!DIFF_FILE_VALID(p->one)) { if (!DIFF_FILE_VALID(p->two)) return 0; /* ignore unmerged */ -- 2.11.0