From cd4c77d989983778432363061e99219f034c3717 Mon Sep 17 00:00:00 2001 From: Jason A. Donenfeld Date: Sat, 25 May 2013 16:32:37 +0200 Subject: readme: Accept multiple candidates and test them. The readme variable may now contain multiple space deliminated entries, which per usual are either a filepath or a git ref filepath. If multiple are specified, cgit will now select the first one in the list that exists. This is to make it easier to specify multiple default readme types in the main cgitrc file and have them automatically get applied to each repo based on what exists. Signed-off-by: Jason A. Donenfeld --- ui-blob.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'ui-blob.c') diff --git a/ui-blob.c b/ui-blob.c index 8f6989f..b4be139 100644 --- a/ui-blob.c +++ b/ui-blob.c @@ -13,7 +13,7 @@ #include "ui-shared.h" struct walk_tree_context { - char *match_path; + const char *match_path; unsigned char *matched_sha1; int found_path; }; @@ -31,6 +31,32 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, return 0; } +int cgit_ref_path_exists(const char *path, const char *ref) +{ + unsigned char sha1[20]; + unsigned long size; + struct pathspec_item path_items = { + .match = path, + .len = strlen(path) + }; + struct pathspec paths = { + .nr = 1, + .items = &path_items + }; + struct walk_tree_context walk_tree_ctx = { + .match_path = path, + .matched_sha1 = sha1, + .found_path = 0 + }; + + if (get_sha1(ref, sha1)) + return 0; + if (sha1_object_info(sha1, &size) != OBJ_COMMIT) + return 0; + read_tree_recursive(lookup_commit_reference(sha1)->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); + return walk_tree_ctx.found_path; +} + int cgit_print_file(char *path, const char *head) { unsigned char sha1[20]; -- cgit v1.2.3-70-g09d2