Merge branch 'stable'

lh/pretty-blob-view
Lars Hjemli 15 years ago
commit 547a64fbd6

@ -1,4 +1,4 @@
CGIT_VERSION = v0.8.3 CGIT_VERSION = v0.8.3.1
CGIT_SCRIPT_NAME = cgit.cgi CGIT_SCRIPT_NAME = cgit.cgi
CGIT_SCRIPT_PATH = /var/www/htdocs/cgit CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)

@ -50,7 +50,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
commit = lookup_commit_reference(sha1); commit = lookup_commit_reference(sha1);
match_path = path; match_path = path;
matched_sha1 = sha1; 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); type = sha1_object_info(sha1,&size);
} }

@ -88,7 +88,7 @@ void cgit_print_plain(struct cgit_context *ctx)
return; return;
} }
match_path = ctx->qry.path; 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) if (!match)
html_status(404, "Not found", 0); html_status(404, "Not found", 0);
} }

@ -286,6 +286,6 @@ void cgit_print_tree(const char *rev, char *path)
} }
match_path = 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(); ls_tail();
} }

Loading…
Cancel
Save