summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-12-12 11:09:47 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-12-12 11:09:47 (UTC)
commit547a64fbd65de293c290f4e18bbeae958d54aaa7 (patch) (unidiff)
treee35d8ae4e9408cd552e539c5af08d4bd6fdd1e8f
parent0642435fed6793a0d038e1e5097a91293ee89a05 (diff)
parentc86e206a9773f97dc6de6bbf45712bb304de3653 (diff)
downloadcgit-547a64fbd65de293c290f4e18bbeae958d54aaa7.zip
cgit-547a64fbd65de293c290f4e18bbeae958d54aaa7.tar.gz
cgit-547a64fbd65de293c290f4e18bbeae958d54aaa7.tar.bz2
Merge branch 'stable'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--ui-blob.c2
-rw-r--r--ui-plain.c2
-rw-r--r--ui-tree.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index f8a4d47..d39a30e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
1CGIT_VERSION = v0.8.3 1CGIT_VERSION = v0.8.3.1
2CGIT_SCRIPT_NAME = cgit.cgi 2CGIT_SCRIPT_NAME = cgit.cgi
3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit 3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
4CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) 4CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
5CGIT_CONFIG = /etc/cgitrc 5CGIT_CONFIG = /etc/cgitrc
diff --git a/ui-blob.c b/ui-blob.c
index 2ccd31d..89330ce 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -49,9 +49,9 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
49 if((!hex) && type == OBJ_COMMIT && path) { 49 if((!hex) && type == OBJ_COMMIT && path) {
50 commit = lookup_commit_reference(sha1); 50 commit = lookup_commit_reference(sha1);
51 match_path = path; 51 match_path = path;
52 matched_sha1 = sha1; 52 matched_sha1 = sha1;
53 read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); 53 read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
54 type = sha1_object_info(sha1,&size); 54 type = sha1_object_info(sha1,&size);
55 } 55 }
56 56
57 if (type == OBJ_BAD) { 57 if (type == OBJ_BAD) {
diff --git a/ui-plain.c b/ui-plain.c
index a4ce077..66cb19c 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -87,8 +87,8 @@ void cgit_print_plain(struct cgit_context *ctx)
87 html_status(404, "Not found", 0); 87 html_status(404, "Not found", 0);
88 return; 88 return;
89 } 89 }
90 match_path = ctx->qry.path; 90 match_path = ctx->qry.path;
91 read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); 91 read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
92 if (!match) 92 if (!match)
93 html_status(404, "Not found", 0); 93 html_status(404, "Not found", 0);
94} 94}
diff --git a/ui-tree.c b/ui-tree.c
index f281937..94aff8f 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -285,7 +285,7 @@ void cgit_print_tree(const char *rev, char *path)
285 return; 285 return;
286 } 286 }
287 287
288 match_path = path; 288 match_path = path;
289 read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); 289 read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
290 ls_tail(); 290 ls_tail();
291} 291}