Update git to v1.7.5.4

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index cb52380916447eecb62b66957a1655dd6a6a0fd6..0967f922de18c8b132d40577b89ae16c0722546c 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -33,6 +33,7 @@ int chk_non_negative(int result, char *msg)
        return result;
 }
 
        return result;
 }
 

+char *cgit_default_repo_desc = "[no description]";

 struct cgit_repo *cgit_add_repo(const char *url)
 {
        struct cgit_repo *ret;
 struct cgit_repo *cgit_add_repo(const char *url)
 {
        struct cgit_repo *ret;


@@ -52,10 +53,9 @@ struct cgit_repo *cgit_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 = "[no description]";
+       ret->desc = cgit_default_repo_desc;

        ret->owner = NULL;
        ret->section = ctx.cfg.section;
        ret->owner = NULL;
        ret->section = ctx.cfg.section;

-       ret->defbranch = "master";

        ret->snapshots = ctx.cfg.snapshots;
        ret->enable_commit_graph = ctx.cfg.enable_commit_graph;
        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
        ret->snapshots = ctx.cfg.snapshots;
        ret->enable_commit_graph = ctx.cfg.enable_commit_graph;
        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;


@@ -63,6 +63,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
        ret->enable_subject_links = ctx.cfg.enable_subject_links;
        ret->max_stats = ctx.cfg.max_stats;
        ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
        ret->enable_subject_links = ctx.cfg.enable_subject_links;
        ret->max_stats = ctx.cfg.max_stats;

+       ret->commit_sort = ctx.cfg.commit_sort;

        ret->module_link = ctx.cfg.module_link;
        ret->readme = ctx.cfg.readme;
        ret->mtime = -1;
        ret->module_link = ctx.cfg.module_link;
        ret->readme = ctx.cfg.readme;
        ret->mtime = -1;


@@ -306,7 +307,7 @@ void cgit_diff_tree(const unsigned char *old_sha1,
                    filepair_fn fn, const char *prefix, int ignorews)
 {
        struct diff_options opt;
                    filepair_fn fn, const char *prefix, int ignorews)
 {
        struct diff_options opt;

-       int prefixlen;
+       struct pathspec_item item;

 
        diff_setup(&opt);
        opt.output_format = DIFF_FORMAT_CALLBACK;
 
        diff_setup(&opt);
        opt.output_format = DIFF_FORMAT_CALLBACK;


@@ -318,10 +319,10 @@ void cgit_diff_tree(const unsigned char *old_sha1,
        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) {

-               opt.nr_paths = 1;
-               opt.paths = &prefix;
-               prefixlen = strlen(prefix);
-               opt.pathlens = &prefixlen;
+               item.match = prefix;
+               item.len = strlen(prefix);
+               opt.pathspec.nr = 1;
+               opt.pathspec.items = &item;

        }
        diff_setup_done(&opt);
 
        }
        diff_setup_done(&opt);