crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

readme: Accept multiple candidates and test them.

Browse Source 
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 <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld
2013-05-25 16:32:37 +02:00
parent c0dfaf1c28
commit cd4c77d989
5 changed files with 95 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ui-blob.c
View File

@ -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];