Merge branch 'jc/cherry'

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index cfcce315babb0edb7ad7be7f2ab2437aaf41eb9d..286919e71428049eda1449ba71ac81667ebc3f7d 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -5,8 +5,6 @@
 #include "diff.h"
 #include "diffcore.h"
 
-#include <regex.h>
-
 static unsigned int contains(struct diff_filespec *one,
                             const char *needle, unsigned long len,
                             regex_t *regexp)
@@ -16,6 +14,8 @@ static unsigned int contains(struct diff_filespec *one,
        const char *data;
        if (diff_populate_filespec(one, 0))
                return 0;
+       if (!len)
+               return 0;
 
        sz = one->size;
        data = one->data;