diff options
| -rw-r--r-- | cgit.c | 9 |
1 files changed, 5 insertions, 4 deletions
| @@ -471,13 +471,14 @@ static char *find_default_branch(struct cgit_repo *repo) | |||
| 471 | static char *guess_defbranch(void) | 471 | static char *guess_defbranch(void) |
| 472 | { | 472 | { |
| 473 | const char *ref; | 473 | const char *ref; |
| 474 | unsigned char sha1[20]; | 474 | struct object_id oid; |
| 475 | 475 | ||
| 476 | ref = resolve_ref_unsafe("HEAD", 0, sha1, NULL); | 476 | ref = resolve_ref_unsafe("HEAD", 0, oid.hash, NULL); |
| 477 | if (!ref || !starts_with(ref, "refs/heads/")) | 477 | if (!ref || !starts_with(ref, "refs/heads/")) |
| 478 | return "master"; | 478 | return "master"; |
| 479 | return xstrdup(ref + 11); | 479 | return xstrdup(ref + 11); |
| 480 | } | 480 | } |
| 481 | |||
| 481 | /* The caller must free filename and ref after calling this. */ | 482 | /* The caller must free filename and ref after calling this. */ |
| 482 | static inline void parse_readme(const char *readme, char **filename, char **ref, struct cgit_repo *repo) | 483 | static inline void parse_readme(const char *readme, char **filename, char **ref, struct cgit_repo *repo) |
| 483 | { | 484 | { |
| @@ -557,7 +558,7 @@ static void print_no_repo_clone_urls(const char *url) | |||
| 557 | 558 | ||
| 558 | static int prepare_repo_cmd(void) | 559 | static int prepare_repo_cmd(void) |
| 559 | { | 560 | { |
| 560 | unsigned char sha1[20]; | 561 | struct object_id oid; |
| 561 | int nongit = 0; | 562 | int nongit = 0; |
| 562 | int rc; | 563 | int rc; |
| 563 | 564 | ||
| @@ -615,7 +616,7 @@ static int prepare_repo_cmd(void) | |||
| 615 | return 1; | 616 | return 1; |
| 616 | } | 617 | } |
| 617 | 618 | ||
| 618 | if (get_sha1(ctx.qry.head, sha1)) { | 619 | if (get_oid(ctx.qry.head, &oid)) { |
| 619 | char *old_head = ctx.qry.head; | 620 | char *old_head = ctx.qry.head; |
| 620 | ctx.qry.head = xstrdup(ctx.repo->defbranch); | 621 | ctx.qry.head = xstrdup(ctx.repo->defbranch); |
| 621 | cgit_print_error_page(404, "Not found", | 622 | cgit_print_error_page(404, "Not found", |
