about summary refs log tree commit diff stats
path: root/scan-tree.c
diff options
context:
space:
mode:
authorJulius Plenz2011-04-07 12:59:24 +0200
committerLars Hjemli2011-06-20 20:42:19 +0200
commitd711de55280c3c9c10cfda4e24c8f3b3015217b2 (patch)
tree2e4a7d8dcaeefb4259756a16be04c40dee7ed49c /scan-tree.c
parentMerge branch 'stable' (diff)
downloadcgit-d711de55280c3c9c10cfda4e24c8f3b3015217b2.tar.gz
cgit-d711de55280c3c9c10cfda4e24c8f3b3015217b2.zip
guess default branch from HEAD
This is a saner alternative than hardcoding the default branch to be
"master". The add_repo() function will now check for a symbolic ref in
repo_path/HEAD. If there is a suitable one, overwrite repo->defbranch
with it. Note that you'll need to strip the newline from the file (->
len-17).

If HEAD is a symbolic link pointing directly to a branch below
refs/heads/, do a readlink() instead to find the ref name.

Signed-off-by: Julius Plenz <plenz@cis.fu-berlin.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'scan-tree.c')
-rw-r--r--scan-tree.c36
1 files changed, 36 insertions, 0 deletions
diff --git a/scan-tree.c b/scan-tree.c index 378d795..a429a9f 100644 --- a/scan-tree.c +++ b/scan-tree.c
@@ -68,6 +68,39 @@ static char *xstrrchr(char *s, char *from, int c)
68 return from < s ? NULL : from; 68 return from < s ? NULL : from;
69} 69}
70 70
71static char *guess_defbranch(const char *repo_path)
72{
73 int fd, len;
74 char buffer[256];
75 char *ref_start;
76 char *head;
77
78 head = fmt("%s/HEAD", repo_path);
79 fd = open(head, O_RDONLY);
80 if (fd == -1)
81 return xstrdup("master");
82
83 memset(buffer, 0, sizeof(buffer));
84 len = read_in_full(fd, buffer, sizeof(buffer)-1);
85 close(fd);
86
87 if(!memcmp(buffer, "ref: refs/heads/", 16))
88 return xstrndup(buffer+16, len-17);
89
90 if(strlen(buffer) == 41) {
91 /* probably contains a SHA1 sum */
92 memset(buffer, 0, sizeof(buffer));
93 if(readlink(head, buffer, sizeof(buffer)-1)) {
94 ref_start = memmem(buffer, sizeof(buffer)-1, "refs/heads/", 11);
95 if(ref_start)
96 return xstrdup(ref_start+11);
97 }
98 }
99
100 return xstrdup("master");
101}
102
103
71static void add_repo(const char *base, const char *path, repo_config_fn fn) 104static void add_repo(const char *base, const char *path, repo_config_fn fn)
72{ 105{
73 struct stat st; 106 struct stat st;
@@ -105,6 +138,9 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
105 *p = '\0'; 138 *p = '\0';
106 repo->name = repo->url; 139 repo->name = repo->url;
107 repo->path = xstrdup(path); 140 repo->path = xstrdup(path);
141
142 repo->defbranch = guess_defbranch(repo->path);
143
108 while (!owner) { 144 while (!owner) {
109 if ((pwd = getpwuid(st.st_uid)) == NULL) { 145 if ((pwd = getpwuid(st.st_uid)) == NULL) {
110 fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", 146 fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n",