Only guess default branch when a repo page is requested

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index be2ae59e0a3fb764b8f3d6977189ff492d831a8c..9c839a94d0aee9ee9a9462c1646af52afef7d92d 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -56,7 +56,6 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->desc = "[no description]";
        ret->owner = NULL;
        ret->section = ctx.cfg.section;
-       ret->defbranch = "master";
        ret->snapshots = ctx.cfg.snapshots;
        ret->enable_commit_graph = ctx.cfg.enable_commit_graph;
        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
@@ -70,6 +69,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->about_filter = ctx.cfg.about_filter;
        ret->commit_filter = ctx.cfg.commit_filter;
        ret->source_filter = ctx.cfg.source_filter;
+       ret->clone_url = ctx.cfg.clone_url;
        return ret;
 }
 
@@ -374,7 +374,8 @@ typedef struct {
        char * value;
 } cgit_env_var;
 
-static void prepare_env(struct cgit_repo * repo) {
+void cgit_prepare_repo_env(struct cgit_repo * repo)
+{
        cgit_env_var env_vars[] = {
                { .name = "CGIT_REPO_URL", .value = repo->url },
                { .name = "CGIT_REPO_NAME", .value = repo->name },
@@ -395,7 +396,7 @@ static void prepare_env(struct cgit_repo * repo) {
                        fprintf(stderr, warn, p->name, p->value);
 }
 
-int cgit_open_filter(struct cgit_filter *filter, struct cgit_repo * repo)
+int cgit_open_filter(struct cgit_filter *filter)
 {
 
        filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
@@ -406,8 +407,6 @@ int cgit_open_filter(struct cgit_filter *filter, struct cgit_repo * repo)
                close(filter->pipe_fh[1]);
                chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO),
                        "Unable to use pipe as STDIN");
-               if (repo)
-                       prepare_env(repo);
                execvp(filter->cmd, filter->argv);
                die("Unable to exec subprocess %s: %s (%d)", filter->cmd,
                        strerror(errno), errno);