From nobody Mon Jun 27 22:32:17 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B962086257E; Mon, 27 Jun 2022 22:32:17 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LX2Xd4rKvz4grs; Mon, 27 Jun 2022 22:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656369137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qLDfmI8Wvn6ChBZE3c1YMNFMT7uA85DGjPgKCM3ofL4=; b=Nb+ouI9CmAspPgJ+40yp9HxzB/CpjPSrOwLCv5CCHEJawS5H82krsVmY7XiGL78nHqYj7i mD0VRVFwYogB22jMpy4xIEcZjMBIGbWQLPEFXfr+o4LA/cwkP9ExQb6yk/SLRGCgCUhz7y L2XOBWxahAo5OyhT4/eH3aiSuZH7R1jZNnkEzzRHDr0ZOdS/KP7TuEOH/+EVB3nqvhLfRN r/9UUfqumUbPPzpdgOvQpzg9m/7TR68HH/wJqHKQVzkuNi04ztOLP0mYti3OYaMKIWoxCg i8ikmkutub/GmN17lhVLqYVtEcV8dpiGH79Mq85aEXeFdn08doQ8nIeUOY7u9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 868F310DFD; Mon, 27 Jun 2022 22:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25RMWH3t065397; Mon, 27 Jun 2022 22:32:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25RMWHqL065396; Mon, 27 Jun 2022 22:32:17 GMT (envelope-from git) Date: Mon, 27 Jun 2022 22:32:17 GMT Message-Id: <202206272232.25RMWHqL065396@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 0ab8da801536 - main - devel/git-cinnabar: unbreak after 7a2cc88e5838 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ab8da801536e6e2adae73031c71faed7f2d7962 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656369137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qLDfmI8Wvn6ChBZE3c1YMNFMT7uA85DGjPgKCM3ofL4=; b=mwckSp59qWCJzDAE/ojG12r5Jvz+zvN2R+mVjbpU7SLtmQ+M1pg6GWsP2azwi89C8XO52/ LDsPHwvIxZsM7gCHz+sYHOdg9hMjmaghEfG/Y4MfAIQAir5UcCMvvPN5aiEKf2BeSKnkjC 6RNmK+Q2gyWD2NUbPATdejtruxDkBF3x1xwELbwPiY92A03/mhV3Uiu20SKi7XEMeCKJlg TD9FS0cOGqGv82C+rVcEAPkvxT7SygWcS6K1m25+n9wwaq426ASrsgyckFlAzodNi3059K puIgdcjAr8sMI8QHeVEBQ8F1pGoDFRi/HyZMyPisInezKt0hxnwNZ3XSmmdH3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656369137; a=rsa-sha256; cv=none; b=xHnRbeUi8f+rEslsvDQIE2u3MwyiWcuSPuf69hXbJENadPXxOGKydbSdTuj+OH7u07Yvbz 2XmfBcEq6/LiFXBzi+jh+VB3FBCnRyO4PSCeoVq7BLL0cz2RDMHHpjsUBEUxHZigB4ZORF yXkoTZ7Jc/j+93pqMl0tfLvIE6+K4IXrpN0R8v+iCQepJVF03sS/rW2VPxyb6o+NLKdA7X QOzuyNORurgnI95C7GBaR46dWixIWsvJWYOjsykq9dNYgKQs5lCYcKJLP7p91pZQNAUHv8 0B/6WnPUtvmS3oyH3rC5RGBK8oFH5l11x7D2Pry61Mg4SHTk6Jk2DMcWeiJWgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ab8da801536e6e2adae73031c71faed7f2d7962 commit 0ab8da801536e6e2adae73031c71faed7f2d7962 Author: Jan Beich AuthorDate: 2022-06-27 22:21:41 +0000 Commit: Jan Beich CommitDate: 2022-06-27 22:32:13 +0000 devel/git-cinnabar: unbreak after 7a2cc88e5838 helper/hg-connect-stdio.c:218:22: error: no member named 'env_array' in 'struct child_process' strvec_pushv(&proc->env_array, (const char **)local_repo_env); ~~~~ ^ --- devel/git-cinnabar/Makefile | 2 +- devel/git-cinnabar/files/patch-git-2.37 | 57 +++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile index 7595c7c5f085..2078bb697f21 100644 --- a/devel/git-cinnabar/Makefile +++ b/devel/git-cinnabar/Makefile @@ -1,6 +1,6 @@ PORTNAME= git-cinnabar DISTVERSION= 0.5.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org diff --git a/devel/git-cinnabar/files/patch-git-2.37 b/devel/git-cinnabar/files/patch-git-2.37 new file mode 100644 index 000000000000..5783b8c7e86e --- /dev/null +++ b/devel/git-cinnabar/files/patch-git-2.37 @@ -0,0 +1,57 @@ +https://github.com/glandium/git-cinnabar/commit/7d6f93efb9a8 + +--- helper/GIT-VERSION.mk.orig 2021-11-19 21:23:13 UTC ++++ helper/GIT-VERSION.mk +@@ -1,2 +1,2 @@ +-GIT_VERSION ?= v2.36.0 ++GIT_VERSION ?= v2.37.0 + WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1 +--- helper/cinnabar-helper.c.orig 2021-11-19 21:23:13 UTC ++++ helper/cinnabar-helper.c +@@ -2415,7 +2415,7 @@ static void init_git_config() + setup_path(); + } + strvec_pushl(&proc.args, "git", "config", "--system", "-e", NULL); +- strvec_push(&proc.env_array, "GIT_EDITOR=echo"); ++ strvec_push(&proc.env, "GIT_EDITOR=echo"); + proc.no_stdin = 1; + proc.no_stderr = 1; + /* We don't really care about the capture_command return value. If +@@ -2583,3 +2583,8 @@ int main(int argc, const char *argv[]) + hashmap_clear_and_free(&git_tree_cache, struct oid_map_entry, ent); + return 0; + } ++ ++int common_exit(const char *file, int line, int code) ++{ ++ return code; ++} +--- helper/hg-connect-stdio.c.orig 2021-11-19 21:23:13 UTC ++++ helper/hg-connect-stdio.c +@@ -215,7 +215,7 @@ struct hg_connection *hg_connect_stdio(const char *url, int flags) + if (looks_like_command_line_option(path)) + die("strange pathname '%s' blocked", path); + +- strvec_pushv(&proc->env_array, (const char **)local_repo_env); ++ strvec_pushv(&proc->env, (const char **)local_repo_env); + proc->use_shell = 1; + proc->in = proc->out = proc->err = -1; + +--- tests/ls-remote.t.orig 2021-11-19 21:23:13.000000000 +0000 ++++ tests/ls-remote.t +@@ -323,7 +323,6 @@ + 23bcc26b9fea7e37426260465bed35eac54af5e1 refs/heads/branches/foo/tip + + $ git -c fetch.prune=true -C repo-git remote update +- Fetching origin + From hg::.*/ls-remote.t/repo (re) + - [deleted] (none) -> origin/branches/default/636e60525868096cbdc961870493510558f41d2f + + 5c5b259...445bd26 branches/default/tip -> origin/branches/default/tip (forced update) +@@ -450,7 +449,6 @@ + $ cd .. + + $ git -c fetch.prune=true -C repo-git remote update +- Fetching origin + From hg::.*/ls-remote.t/repo (re) + 445bd26..66e3a05 branches/default/tip -> origin/branches/default/tip + * [new branch] bookmarks/@ -> origin/bookmarks/@