cgit: prepare repo before error pages

[ps-cgit] / ui-clone.c

diff --git a/ui-clone.c b/ui-clone.c
index e4ddd34932f8182033267d2a439f6b76950a730f..bc989804df9b3090110efe01e21427099d98b0f7 100644 (file)
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -11,20 +11,21 @@
 #include "ui-clone.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-clone.h"
 #include "html.h"
 #include "ui-shared.h"

+#include "packfile.h"

 
 static int print_ref_info(const char *refname, const struct object_id *oid,
                           int flags, void *cb_data)
 {
        struct object *obj;
 
 
 static int print_ref_info(const char *refname, const struct object_id *oid,
                           int flags, void *cb_data)
 {
        struct object *obj;
 

-       if (!(obj = parse_object(oid->hash)))
+       if (!(obj = parse_object(oid)))

                return 0;
 
        htmlf("%s\t%s\n", oid_to_hex(oid), refname);
        if (obj->type == OBJ_TAG) {
                if (!(obj = deref_tag(obj, refname, 0)))
                        return 0;
                return 0;
 
        htmlf("%s\t%s\n", oid_to_hex(oid), refname);
        if (obj->type == OBJ_TAG) {
                if (!(obj = deref_tag(obj, refname, 0)))
                        return 0;

-               htmlf("%s\t%s^{}\n", sha1_to_hex(obj->sha1), refname);
+               htmlf("%s\t%s^{}\n", oid_to_hex(&obj->oid), refname);

        }
        return 0;
 }
        }
        return 0;
 }


@@ -57,13 +58,13 @@ static void send_file(const char *path)
        if (stat(path, &st)) {
                switch (errno) {
                case ENOENT:
        if (stat(path, &st)) {
                switch (errno) {
                case ENOENT:

-                       html_status(404, "Not found", 0);
+                       cgit_print_error_page(404, "Not found", "Not found");

                        break;
                case EACCES:
                        break;
                case EACCES:

-                       html_status(403, "Forbidden", 0);
+                       cgit_print_error_page(403, "Forbidden", "Forbidden");

                        break;
                default:
                        break;
                default:

-                       html_status(400, "Bad request", 0);
+                       cgit_print_error_page(400, "Bad request", "Bad request");

                }
                return;
        }
                }
                return;
        }


@@ -78,7 +79,7 @@ static void send_file(const char *path)
 void cgit_clone_info(void)
 {
        if (!ctx.qry.path || strcmp(ctx.qry.path, "refs")) {
 void cgit_clone_info(void)
 {
        if (!ctx.qry.path || strcmp(ctx.qry.path, "refs")) {

-               html_status(400, "Bad request", 0);
+               cgit_print_error_page(400, "Bad request", "Bad request");

                return;
        }
 
                return;
        }
 


@@ -91,7 +92,7 @@ void cgit_clone_info(void)
 void cgit_clone_objects(void)
 {
        if (!ctx.qry.path) {
 void cgit_clone_objects(void)
 {
        if (!ctx.qry.path) {

-               html_status(400, "Bad request", 0);
+               cgit_print_error_page(400, "Bad request", "Bad request");

                return;
        }
 
                return;
        }