From owner-svn-ports-all@freebsd.org Mon Apr 13 18:23:07 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 856722C5809; Mon, 13 Apr 2020 18:23:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 491H6g30VDz41jZ; Mon, 13 Apr 2020 18:23:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 61A5B1FBBB; Mon, 13 Apr 2020 18:23:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03DIN7Jq067993; Mon, 13 Apr 2020 18:23:07 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03DIN7hE067992; Mon, 13 Apr 2020 18:23:07 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202004131823.03DIN7hE067992@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 13 Apr 2020 18:23:07 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/devel/git-cinnabar: . files X-SVN-Commit-Revision: 531625 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2020 18:23:07 -0000 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);