aboutsummaryrefslogtreecommitdiffstats
path: root/cgit.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2011-06-20 20:59:10 +0200
committerLars Hjemli <hjemli@gmail.com>2011-06-20 20:59:10 +0200
commite95c70d4ea997d1217d5c81cb3b640f3fa025df1 (patch)
tree36bb5cb276494ae1c7b813969f5381bffb06a3d4 /cgit.c
parentd711de55280c3c9c10cfda4e24c8f3b3015217b2 (diff)
downloadcgit-e95c70d4ea997d1217d5c81cb3b640f3fa025df1.tar.gz
cgit-e95c70d4ea997d1217d5c81cb3b640f3fa025df1.tar.xz
Only guess default branch when a repo page is requested
There's no need to invoke guess_defbranch() for each repo during scan-path, since repo.defbranch is only used when repo content is being displayed. Also, some users prefer to register their projects manually in cgitrc but they got no benefit from the new repo.defbranch handling. This patch tries to rectify these issues by only invoking guess_defbranch() when needed, regardless of how the repo was registered. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'cgit.c')
-rw-r--r--cgit.c35
1 files changed, 34 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index b7807ad..e3fbbf4 100644
--- a/cgit.c
+++ b/cgit.c
@@ -416,6 +416,37 @@ char *find_default_branch(struct cgit_repo *repo)
return ref;
}
+static char *guess_defbranch(const char *repo_path)
+{
+ int fd, len;
+ char buffer[256];
+ char *ref_start;
+ char *head;
+
+ head = fmt("%s/HEAD", repo_path);
+ fd = open(head, O_RDONLY);
+ if (fd == -1)
+ return xstrdup("master");
+
+ memset(buffer, 0, sizeof(buffer));
+ len = read_in_full(fd, buffer, sizeof(buffer) - 1);
+ close(fd);
+
+ if(!memcmp(buffer, "ref: refs/heads/", 16))
+ return xstrndup(buffer + 16, len - 17);
+
+ if(strlen(buffer) == 41) {
+ /* probably contains a SHA1 sum */
+ memset(buffer, 0, sizeof(buffer));
+ if(readlink(head, buffer, sizeof(buffer)-1)) {
+ ref_start = memmem(buffer, sizeof(buffer)-1, "refs/heads/", 11);
+ if(ref_start)
+ return xstrdup(ref_start+11);
+ }
+ }
+ return xstrdup("master");
+}
+
static int prepare_repo_cmd(struct cgit_context *ctx)
{
char *tmp;
@@ -442,10 +473,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) {