summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2012-03-18 21:00:18 (GMT)
committerLars Hjemli <hjemli@gmail.com>2012-03-18 21:00:18 (GMT)
commit181b6e789b79fc385e5ec75b2b83f01192d54051 (patch)
tree8888b5eb9c6674b69bcb8f508f9d6f548fc1fed3
parent2b9fab8d30420d935745c4d84ea22412ab2485e5 (diff)
parent5293c8b7992bf3211b6bde7acbbd4e74ffd926d4 (diff)
downloadcgit-181b6e789b79fc385e5ec75b2b83f01192d54051.zip
cgit-181b6e789b79fc385e5ec75b2b83f01192d54051.tar.gz
cgit-181b6e789b79fc385e5ec75b2b83f01192d54051.tar.bz2
Merge branch 'jp/defbranch'
-rw-r--r--cgit.c15
-rw-r--r--cgitrc.5.txt3
-rw-r--r--shared.c1
-rw-r--r--ui-repolist.c3
4 files changed, 18 insertions, 4 deletions
diff --git a/cgit.c b/cgit.c
index 7e3d349..6a75f27 100644
--- a/cgit.c
+++ b/cgit.c
@@ -421,6 +421,17 @@ char *find_default_branch(struct cgit_repo *repo)
return ref;
}
+static char *guess_defbranch(const char *repo_path)
+{
+ const char *ref;
+ unsigned char sha1[20];
+
+ ref = resolve_ref("HEAD", sha1, 0, NULL);
+ if (!ref || prefixcmp(ref, "refs/heads/"))
+ return "master";
+ return xstrdup(ref + 11);
+}
+
static int prepare_repo_cmd(struct cgit_context *ctx)
{
char *tmp;
@@ -447,10 +458,12 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
}
ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc);
+ if (!ctx->repo->defbranch)
+ ctx->repo->defbranch = guess_defbranch(ctx->repo->path);
+
if (!ctx->qry.head) {
ctx->qry.nohead = 1;
ctx->qry.head = find_default_branch(ctx->repo);
- ctx->repo->defbranch = ctx->qry.head;
}
if (!ctx->qry.head) {
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index b4ad2ac..fab0e0a 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -377,7 +377,8 @@ repo.commit-filter::
repo.defbranch::
The name of the default branch for this repository. If no such branch
exists in the repository, the first branch name (when sorted) is used
- as default instead. Default value: "master".
+ as default instead. Default value: branch pointed to by HEAD, or
+ "master" if there is no suitable HEAD.
repo.desc::
The value to show as repository description. Default value: none.
diff --git a/shared.c b/shared.c
index cb52380..0a0e22e 100644
--- a/shared.c
+++ b/shared.c
@@ -55,7 +55,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;
diff --git a/ui-repolist.c b/ui-repolist.c
index a09a689..d946f32 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -45,7 +45,8 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
return 1;
}
- path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
+ path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch ?
+ repo->defbranch : "master");
if (stat(path, &s) == 0) {
*mtime = s.st_mtime;
r->mtime = *mtime;