Use GIT-1.5.4.rc4

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 9c992c8adb3834fa41cfb5e6a453d43dc17a0580..f06389471e132197f8be54d4d1ae4825f3957023 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -118,7 +118,7 @@ struct repoinfo *add_repo(const char *url)
        ret->url = trim_end(url, '/');
        ret->name = ret->url;
        ret->path = NULL;
        ret->url = trim_end(url, '/');
        ret->name = ret->url;
        ret->path = NULL;

-       ret->desc = NULL;
+       ret->desc = "[no description]";

        ret->owner = NULL;
        ret->group = cgit_repo_group;
        ret->defbranch = "master";
        ret->owner = NULL;
        ret->group = cgit_repo_group;
        ret->defbranch = "master";


@@ -492,7 +492,7 @@ void cgit_diff_tree(const unsigned char *old_sha1,
        opt.output_format = DIFF_FORMAT_CALLBACK;
        opt.detect_rename = 1;
        opt.rename_limit = cgit_renamelimit;
        opt.output_format = DIFF_FORMAT_CALLBACK;
        opt.detect_rename = 1;
        opt.rename_limit = cgit_renamelimit;

-       opt.recursive = 1;
+       DIFF_OPT_SET(&opt, RECURSIVE);

        opt.format_callback = cgit_diff_tree_cb;
        opt.format_callback_data = fn;
        if (prefix) {
        opt.format_callback = cgit_diff_tree_cb;
        opt.format_callback_data = fn;
        if (prefix) {