|
diff --git a/cgit.c b/cgit.c index 8795085..cefeddf 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -194,67 +194,71 @@ struct refmatch { |
194 | int find_current_ref(const char *refname, const unsigned char *sha1, |
194 | int find_current_ref(const char *refname, const unsigned char *sha1, |
195 | int flags, void *cb_data) |
195 | int flags, void *cb_data) |
196 | { |
196 | { |
197 | struct refmatch *info; |
197 | struct refmatch *info; |
198 | |
198 | |
199 | info = (struct refmatch *)cb_data; |
199 | info = (struct refmatch *)cb_data; |
200 | if (!strcmp(refname, info->req_ref)) |
200 | if (!strcmp(refname, info->req_ref)) |
201 | info->match = 1; |
201 | info->match = 1; |
202 | if (!info->first_ref) |
202 | if (!info->first_ref) |
203 | info->first_ref = xstrdup(refname); |
203 | info->first_ref = xstrdup(refname); |
204 | return info->match; |
204 | return info->match; |
205 | } |
205 | } |
206 | |
206 | |
207 | char *find_default_branch(struct cgit_repo *repo) |
207 | char *find_default_branch(struct cgit_repo *repo) |
208 | { |
208 | { |
209 | struct refmatch info; |
209 | struct refmatch info; |
| |
210 | char *ref; |
210 | |
211 | |
211 | info.req_ref = repo->defbranch; |
212 | info.req_ref = repo->defbranch; |
212 | info.first_ref = NULL; |
213 | info.first_ref = NULL; |
213 | info.match = 0; |
214 | info.match = 0; |
214 | for_each_branch_ref(find_current_ref, &info); |
215 | for_each_branch_ref(find_current_ref, &info); |
215 | if (info.match) |
216 | if (info.match) |
216 | return info.req_ref; |
217 | ref = info.req_ref; |
217 | else |
218 | else |
218 | return info.first_ref; |
219 | ref = info.first_ref; |
| |
220 | if (ref) |
| |
221 | ref = xstrdup(ref); |
| |
222 | return ref; |
219 | } |
223 | } |
220 | |
224 | |
221 | static int prepare_repo_cmd(struct cgit_context *ctx) |
225 | static int prepare_repo_cmd(struct cgit_context *ctx) |
222 | { |
226 | { |
223 | char *tmp; |
227 | char *tmp; |
224 | unsigned char sha1[20]; |
228 | unsigned char sha1[20]; |
225 | int nongit = 0; |
229 | int nongit = 0; |
226 | |
230 | |
227 | setenv("GIT_DIR", ctx->repo->path, 1); |
231 | setenv("GIT_DIR", ctx->repo->path, 1); |
228 | setup_git_directory_gently(&nongit); |
232 | setup_git_directory_gently(&nongit); |
229 | if (nongit) { |
233 | if (nongit) { |
230 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, |
234 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, |
231 | "config error"); |
235 | "config error"); |
232 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); |
236 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); |
233 | ctx->repo = NULL; |
237 | ctx->repo = NULL; |
234 | cgit_print_http_headers(ctx); |
238 | cgit_print_http_headers(ctx); |
235 | cgit_print_docstart(ctx); |
239 | cgit_print_docstart(ctx); |
236 | cgit_print_pageheader(ctx); |
240 | cgit_print_pageheader(ctx); |
237 | cgit_print_error(tmp); |
241 | cgit_print_error(tmp); |
238 | cgit_print_docend(); |
242 | cgit_print_docend(); |
239 | return 1; |
243 | return 1; |
240 | } |
244 | } |
241 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); |
245 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); |
242 | |
246 | |
243 | if (!ctx->qry.head) { |
247 | if (!ctx->qry.head) { |
244 | ctx->qry.head = xstrdup(find_default_branch(ctx->repo)); |
248 | ctx->qry.head = find_default_branch(ctx->repo); |
245 | ctx->repo->defbranch = ctx->qry.head; |
249 | ctx->repo->defbranch = ctx->qry.head; |
246 | } |
250 | } |
247 | |
251 | |
248 | if (!ctx->qry.head) { |
252 | if (!ctx->qry.head) { |
249 | cgit_print_http_headers(ctx); |
253 | cgit_print_http_headers(ctx); |
250 | cgit_print_docstart(ctx); |
254 | cgit_print_docstart(ctx); |
251 | cgit_print_pageheader(ctx); |
255 | cgit_print_pageheader(ctx); |
252 | cgit_print_error("Repository seems to be empty"); |
256 | cgit_print_error("Repository seems to be empty"); |
253 | cgit_print_docend(); |
257 | cgit_print_docend(); |
254 | return 1; |
258 | return 1; |
255 | } |
259 | } |
256 | |
260 | |
257 | if (get_sha1(ctx->qry.head, sha1)) { |
261 | if (get_sha1(ctx->qry.head, sha1)) { |
258 | tmp = xstrdup(ctx->qry.head); |
262 | tmp = xstrdup(ctx->qry.head); |
259 | ctx->qry.head = ctx->repo->defbranch; |
263 | ctx->qry.head = ctx->repo->defbranch; |
260 | cgit_print_http_headers(ctx); |
264 | cgit_print_http_headers(ctx); |
|