crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cgit.c: use resolve_ref() to guess_defbranch()

Browse Source 
The resolve_ref() function handles reading of git- and filesystem
symbolic links (including proper whitespace trimming) and packed refs.
There's no point in reimplementing this function in cgit.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2011-06-20 22:52:51 +00:00
parent e95c70d4ea
commit 8d7c2ec295
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cgit.c
View File

@ -418,33 +418,13 @@ char *find_default_branch(struct cgit_repo *repo)
static char *guess_defbranch(const char *repo_path) static char *guess_defbranch(const char *repo_path)
{ {
int fd, len; const char *ref;
char buffer[256]; unsigned char sha1[20];
char *ref_start;
char *head;
head = fmt("%s/HEAD", repo_path); ref = resolve_ref("HEAD", sha1, 0, NULL);
fd = open(head, O_RDONLY); if (!ref || prefixcmp(ref, "refs/heads/"))
if (fd == -1) return "master";
return xstrdup("master"); return xstrdup(ref + 11);
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) static int prepare_repo_cmd(struct cgit_context *ctx)