diff options
author | Christian Hesse | 2022-01-10 10:18:55 +0100 |
---|---|---|
committer | June McEnroe | 2022-02-17 17:57:00 -0500 |
commit | 129d8a1582b586718a64bbbef393d529b84c7b16 (patch) | |
tree | 656aa5e0d6229fe6b40a52e507ad35fd6ea6f6de /cgit.c | |
parent | Bump version to 1.3.0 (diff) | |
download | cgit-129d8a1582b586718a64bbbef393d529b84c7b16.tar.gz cgit-129d8a1582b586718a64bbbef393d529b84c7b16.zip |
Allow to give readme head from query
Reading the README from repository used to be limited to default branch or a branch given in configuration. Let's allow a branch from query if not specified explicitly.
Diffstat (limited to 'cgit.c')
-rw-r--r-- | cgit.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cgit.c b/cgit.c index d18938c..dd28a79 100644 --- a/cgit.c +++ b/cgit.c | |||
@@ -507,9 +507,11 @@ static inline void parse_readme(const char *readme, char **filename, char **ref, | |||
507 | /* Check if the readme is tracked in the git repo. */ | 507 | /* Check if the readme is tracked in the git repo. */ |
508 | colon = strchr(readme, ':'); | 508 | colon = strchr(readme, ':'); |
509 | if (colon && strlen(colon) > 1) { | 509 | if (colon && strlen(colon) > 1) { |
510 | /* If it starts with a colon, we want to use | 510 | /* If it starts with a colon, we want to use head given |
511 | * the default branch */ | 511 | * from query or the default branch */ |
512 | if (colon == readme && repo->defbranch) | 512 | if (colon == readme && ctx.qry.head) |
513 | *ref = xstrdup(ctx.qry.head); | ||
514 | else if (colon == readme && repo->defbranch) | ||
513 | *ref = xstrdup(repo->defbranch); | 515 | *ref = xstrdup(repo->defbranch); |
514 | else | 516 | else |
515 | *ref = xstrndup(readme, colon - readme); | 517 | *ref = xstrndup(readme, colon - readme); |