Merge branch 'stable'

4 files changed, 4 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index f8a4d47..d39a30e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
-CGIT_VERSION = v0.8.3
+CGIT_VERSION = v0.8.3.1
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
 GIT_VER = 1.6.4.3
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 INSTALL = install
 
 # Define NO_STRCASESTR if you don't have strcasestr.
 #
diff --git a/ui-blob.c b/ui-blob.c
index 2ccd31d..89330ce 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -41,25 +41,25 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
 		if (get_sha1(head,sha1)) {
 			cgit_print_error(fmt("Bad ref: %s", head));
 			return;
 		}
 	}
 
 	type = sha1_object_info(sha1, &size);
 
 	if((!hex) && type == OBJ_COMMIT && path) {
 		commit = lookup_commit_reference(sha1);
 		match_path = path;
 		matched_sha1 = sha1;
-		read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
+		read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
 		type = sha1_object_info(sha1,&size);
 	}
 
 	if (type == OBJ_BAD) {
 		cgit_print_error(fmt("Bad object name: %s", hex));
 		return;
 	}
 
 	buf = read_sha1_file(sha1, &type, &size);
 	if (!buf) {
 		cgit_print_error(fmt("Error reading object %s", hex));
 		return;
diff --git a/ui-plain.c b/ui-plain.c
index a4ce077..66cb19c 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -79,16 +79,16 @@ void cgit_print_plain(struct cgit_context *ctx)
 
 	curr_rev = xstrdup(rev);
 	if (get_sha1(rev, sha1)) {
 		html_status(404, "Not found", 0);
 		return;
 	}
 	commit = lookup_commit_reference(sha1);
 	if (!commit || parse_commit(commit)) {
 		html_status(404, "Not found", 0);
 		return;
 	}
 	match_path = ctx->qry.path;
-	read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
+	read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
 	if (!match)
 		html_status(404, "Not found", 0);
 }
diff --git a/ui-tree.c b/ui-tree.c
index f281937..94aff8f 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -277,15 +277,15 @@ void cgit_print_tree(const char *rev, char *path)
 	}
 
 	html("path: <a href='");
 	html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev)));
 	html("'>root</a>");
 
 	if (path == NULL) {
 		ls_tree(commit->tree->object.sha1, NULL);
 		return;
 	}
 
 	match_path = path;
-	read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
+	read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
 	ls_tail();
 }