Date: Mon, 13 Apr 2020 18:23:07 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531625 - in head/devel/git-cinnabar: . files Message-ID: <202004131823.03DIN7hE067992@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Apr 13 18:23:06 2020 New Revision: 531625 URL: https://svnweb.freebsd.org/changeset/ports/531625 Log: devel/git-cinnabar: unbreak after r531622 ../helper/cinnabar-helper.c:195:41: error: too few arguments to function call, expected 5, have 4 st = open_istream(oid, &type, &sz, NULL); ~~~~~~~~~~~~ ^ ./streaming.h:11:1: note: 'open_istream' declared here struct git_istream *open_istream(struct repository *, const struct object_id *, ^ Obtained from: upstream Added: head/devel/git-cinnabar/files/patch-git-2.26 (contents, props changed) Modified: head/devel/git-cinnabar/Makefile (contents, props changed) Modified: head/devel/git-cinnabar/Makefile ============================================================================== --- head/devel/git-cinnabar/Makefile Mon Apr 13 18:02:15 2020 (r531624) +++ head/devel/git-cinnabar/Makefile Mon Apr 13 18:23:06 2020 (r531625) @@ -2,7 +2,7 @@ PORTNAME= git-cinnabar DISTVERSION= 0.5.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org Added: head/devel/git-cinnabar/files/patch-git-2.26 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/git-cinnabar/files/patch-git-2.26 Mon Apr 13 18:23:06 2020 (r531625) @@ -0,0 +1,29 @@ +https://github.com/glandium/git-cinnabar/commit/716a09de6de7 + +--- helper/cinnabar-helper.c.orig 2020-02-05 23:41:37 UTC ++++ helper/cinnabar-helper.c +@@ -192,7 +192,7 @@ static void send_object(const struct object_id *oid) + unsigned long sz; + struct git_istream *st; + +- st = open_istream(oid, &type, &sz, NULL); ++ st = open_istream(the_repository, oid, &type, &sz, NULL); + + if (!st) + die("open_istream failed for %s", oid_to_hex(oid)); +@@ -2270,6 +2270,7 @@ static void reset_replace_map() + { + oidmap_free(the_repository->objects->replace_map, 1); + FREE_AND_NULL(the_repository->objects->replace_map); ++ the_repository->objects->replace_map_initialized = 0; + } + + static void init_metadata() +@@ -2304,6 +2305,7 @@ static void init_metadata() + the_repository->objects->replace_map = + xmalloc(sizeof(*the_repository->objects->replace_map)); + oidmap_init(the_repository->objects->replace_map, 0); ++ the_repository->objects->replace_map_initialized = 1; + + tree = get_commit_tree(c); + parse_tree(tree);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004131823.03DIN7hE067992>