git: 0ab8da801536 - main - devel/git-cinnabar: unbreak after 7a2cc88e5838

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0ab8da801536e6e2adae73031c71faed7f2d7962

commit 0ab8da801536e6e2adae73031c71faed7f2d7962
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-06-27 22:21:41 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
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/@