Merge branch 'stable'

diff --git a/Makefile b/Makefile
index f8a4d471fea4dbddd515e347b7b8bf8b73bd92dc..d39a30ebb77584fa573537da55eb7915dc547143 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-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)

diff --git a/ui-blob.c b/ui-blob.c
index 2ccd31d2a19e5df1651cf2efff5952254cb3a0ad..89330ce5d12b6af662ed8a66d23262cf83d9152d 100644 (file)
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -50,7 +50,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
                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);
        }
 

diff --git a/ui-plain.c b/ui-plain.c
index a4ce077ac512f4735ea693967a5a0b375473bbf7..66cb19cdbd1058e37e60157c40a18d1a782bb3ff 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -88,7 +88,7 @@ void cgit_print_plain(struct cgit_context *ctx)
                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 f281937f0afc2141fc058818f6cfb18a77bfeb57..94aff8f5d176df3aa544bb63e4146c19f66a0447 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -286,6 +286,6 @@ void cgit_print_tree(const char *rev, char *path)
        }
 
        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();
 }