X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tree-diff.c;h=d978428910a33ee9443343beeb1574e79d2a71ad;hb=ce4c8b24a1efcf155c076d54a7e239251504f669;hp=0ef06a9e36f55c0caec51064f552decd8a58be13;hpb=1301c6eb412e7c5511b952a12e42c70ad56f028b;p=git.git

diff --git a/tree-diff.c b/tree-diff.c
index 0ef06a9e..d9784289 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -9,7 +9,7 @@ static int nr_paths = 0;
 static const char **paths = NULL;
 static int *pathlens = NULL;
 
-static void update_tree_entry(struct tree_desc *desc)
+void update_tree_entry(struct tree_desc *desc)
 {
 	void *buf = desc->buf;
 	unsigned long size = desc->size;
@@ -21,7 +21,7 @@ static void update_tree_entry(struct tree_desc *desc)
 	desc->size = size - len;
 }
 
-static const unsigned char *extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
+const unsigned char *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
 {
 	void *tree = desc->buf;
 	unsigned long size = desc->size;
@@ -56,8 +56,8 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const
 	const unsigned char *sha1, *sha2;
 	int cmp, pathlen1, pathlen2;
 
-	sha1 = extract(t1, &path1, &mode1);
-	sha2 = extract(t2, &path2, &mode2);
+	sha1 = tree_entry_extract(t1, &path1, &mode1);
+	sha2 = tree_entry_extract(t2, &path2, &mode2);
 
 	pathlen1 = strlen(path1);
 	pathlen2 = strlen(path2);
@@ -109,7 +109,7 @@ static int interesting(struct tree_desc *desc, const char *base)
 	if (!nr_paths)
 		return 1;
 
-	(void)extract(desc, &path, &mode);
+	(void)tree_entry_extract(desc, &path, &mode);
 
 	pathlen = strlen(path);
 	baselen = strlen(base);
@@ -167,7 +167,7 @@ static int show_entry(struct diff_options *opt, const char *prefix, struct tree_
 {
 	unsigned mode;
 	const char *path;
-	const unsigned char *sha1 = extract(desc, &path, &mode);
+	const unsigned char *sha1 = tree_entry_extract(desc, &path, &mode);
 
 	if (opt->recursive && S_ISDIR(mode)) {
 		char type[20];
@@ -263,6 +263,10 @@ void diff_tree_setup_paths(const char **p)
 
 		paths = p;
 		nr_paths = count_paths(paths);
+		if (nr_paths == 0) {
+			pathlens = NULL;
+			return;
+		}
 		pathlens = xmalloc(nr_paths * sizeof(int));
 		for (i=0; i<nr_paths; i++)
 			pathlens[i] = strlen(paths[i]);