all repos — cgit @ 3cb5d86dc68bab4883bf5a7cbc90f3e266237355

a hyperfast web frontend for git written in c

ui-summary: Use default branch for readme if : prefix

If the readme value begins with ":", and has no specified branch before
it, use the repository's default branch.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Jason A. Donenfeld Jason@zx2c4.com
Sat, 25 May 2013 14:19:10 +0200
commit

3cb5d86dc68bab4883bf5a7cbc90f3e266237355

parent

03eb76dfad2887127581f5f1b4e2edbe8c4ca5fe

2 files changed, 9 insertions(+), 2 deletions(-)

jump to
M cgitrc.5.txtcgitrc.5.txt

@@ -505,7 +505,9 @@ repo.readme::

A path (relative to <repo.path>) which specifies a file to include verbatim as the "About" page for this repo. You may also specify a git refspec by head or by hash by prepending the refspec followed by - a colon. For example, "master:docs/readme.mkd" Default value: <readme>. + a colon. For example, "master:docs/readme.mkd". If the value begins + with a colon, i.e. ":docs/readme.rst", the default branch of the + repository will be used. Default value: <readme>. repo.snapshots:: A mask of allowed snapshot-formats for this repo, restricted by the
M ui-summary.cui-summary.c

@@ -108,7 +108,12 @@ /* Check if the readme is tracked in the git repo. */

colon = strchr(ctx.repo->readme, ':'); if (colon && strlen(colon) > 1) { *colon = '\0'; - ref = ctx.repo->readme; + /* If it starts with a colon, we want to use + * the default branch */ + if (colon == ctx.repo->readme && ctx.repo->defbranch) + ref = ctx.repo->defbranch; + else + ref = ctx.repo->readme; ctx.repo->readme = colon + 1; if (!(*ctx.repo->readme)) return;