| -rw-r--r-- | cgit.c | 10 | ||||
| -rw-r--r-- | ui-shared.c | 3 |
2 files changed, 4 insertions, 9 deletions
@@ -207,19 +207,15 @@ int find_current_ref(const char *refname, const unsigned char *sha1, char *find_default_branch(struct cgit_repo *repo) { struct refmatch info; - char *ref; info.req_ref = repo->defbranch; info.first_ref = NULL; info.match = 0; for_each_branch_ref(find_current_ref, &info); if (info.match) - ref = info.req_ref; + return info.req_ref; else - ref = info.first_ref; - if (ref) - ref = xstrdup(ref); - return ref; + return info.first_ref; } static int prepare_repo_cmd(struct cgit_context *ctx) @@ -245,7 +241,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx) ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); if (!ctx->qry.head) { - ctx->qry.head = find_default_branch(ctx->repo); + ctx->qry.head = xstrdup(find_default_branch(ctx->repo)); ctx->repo->defbranch = ctx->qry.head; } diff --git a/ui-shared.c b/ui-shared.c index 4280a70..209af6e 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -518,8 +518,7 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page) html_hidden("url", url); } - if (incl_head && ctx.qry.head && ctx.repo->defbranch && - strcmp(ctx.qry.head, ctx.repo->defbranch)) + if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) html_hidden("h", ctx.qry.head); if (ctx.qry.sha1) |