git: update to v2.5.0

[cgit.git] / shared.c

diff --git a/shared.c b/shared.c
index 6259d75d8841c26756aaf00d266940672b6162f3..a83afcb3e275bed29d41ec779bf019ddde7589c5 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -71,8 +71,11 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->about_filter = ctx.cfg.about_filter;
        ret->commit_filter = ctx.cfg.commit_filter;
        ret->source_filter = ctx.cfg.source_filter;
+       ret->email_filter = ctx.cfg.email_filter;
+       ret->owner_filter = ctx.cfg.owner_filter;
        ret->clone_url = ctx.cfg.clone_url;
        ret->submodules.strdup_strings = 1;
+       ret->hide = ret->ignore = 0;
        return ret;
 }
 
@@ -83,6 +86,8 @@ struct cgit_repo *cgit_get_repoinfo(const char *url)
 
        for (i = 0; i < cgit_repolist.count; i++) {
                repo = &cgit_repolist.repos[i];
+               if (repo->ignore)
+                       continue;
                if (!strcmp(repo->url, url))
                        return repo;
        }
@@ -180,13 +185,13 @@ void cgit_add_ref(struct reflist *list, struct refinfo *ref)
        list->refs[list->count++] = ref;
 }
 
-static struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1)
+static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_id *oid)
 {
        struct refinfo *ref;
 
        ref = xmalloc(sizeof (struct refinfo));
        ref->refname = xstrdup(refname);
-       ref->object = parse_object(sha1);
+       ref->object = parse_object(oid->hash);
        switch (ref->object->type) {
        case OBJ_TAG:
                ref->tag = cgit_parse_tag((struct tag *)ref->object);
@@ -234,11 +239,11 @@ void cgit_free_reflist_inner(struct reflist *list)
        free(list->refs);
 }
 
-int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags,
+int cgit_refs_cb(const char *refname, const struct object_id *oid, int flags,
                  void *cb_data)
 {
        struct reflist *list = (struct reflist *)cb_data;
-       struct refinfo *info = cgit_mk_refinfo(refname, sha1);
+       struct refinfo *info = cgit_mk_refinfo(refname, oid);
 
        if (info)
                cgit_add_ref(list, info);
@@ -279,8 +284,8 @@ static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
  * ripped from git and modified to use globals instead of
  * a special callback-struct.
  */
-char *diffbuf = NULL;
-int buflen = 0;
+static char *diffbuf = NULL;
+static int buflen = 0;
 
 static int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
 {
@@ -367,6 +372,7 @@ void cgit_diff_tree(const unsigned char *old_sha1,
        struct diff_options opt;
        struct pathspec_item item;
 
+       memset(&item, 0, sizeof(item));
        diff_setup(&opt);
        opt.output_format = DIFF_FORMAT_CALLBACK;
        opt.detect_rename = 1;
@@ -457,41 +463,6 @@ void cgit_prepare_repo_env(struct cgit_repo * repo)
                        fprintf(stderr, warn, p->name, p->value);
 }
 
-int cgit_open_filter(struct cgit_filter *filter)
-{
-       filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
-               "Unable to duplicate STDOUT");
-       chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess");
-       filter->pid = chk_non_negative(fork(), "Unable to create subprocess");
-       if (filter->pid == 0) {
-               close(filter->pipe_fh[1]);
-               chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO),
-                       "Unable to use pipe as STDIN");
-               execvp(filter->cmd, filter->argv);
-               die_errno("Unable to exec subprocess %s", filter->cmd);
-       }
-       close(filter->pipe_fh[0]);
-       chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO),
-               "Unable to use pipe as STDOUT");
-       close(filter->pipe_fh[1]);
-       return 0;
-}
-
-int cgit_close_filter(struct cgit_filter *filter)
-{
-       int exit_status;
-
-       chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO),
-               "Unable to restore STDOUT");
-       close(filter->old_stdout);
-       if (filter->pid < 0)
-               return 0;
-       waitpid(filter->pid, &exit_status, 0);
-       if (WIFEXITED(exit_status) && !WEXITSTATUS(exit_status))
-               return 0;
-       die("Subprocess %s exited abnormally", filter->cmd);
-}
-
 /* Read the content of the specified file into a newly allocated buffer,
  * zeroterminate the buffer and return 0 on success, errno otherwise.
  */