git-svn: gracefully handle --follow-parent failures

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index d89f314f6d809ebfdfd95104fc653bbfe048b669..286919e71428049eda1449ba71ac81667ebc3f7d 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -1,8 +1,6 @@
 /*
  * Copyright (C) 2005 Junio C Hamano
  */
-#include <regex.h>
-
 #include "cache.h"
 #include "diff.h"
 #include "diffcore.h"
@@ -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;