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,47 +1,47 @@
 PORTNAME=	git-cinnabar
 DISTVERSION=	0.5.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Git remote helper to interact with Mercurial repositories
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${NONEXISTENT}:devel/git:configure
 RUN_DEPENDS=	git:devel/git
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	glandium
 
 USES=		gmake python:3.6+,run shebangfix
 TARGET_ORDER_OVERRIDE=	510:fix-shebang # after do-patch
 SHEBANG_FILES=	${PORTNAME} git-remote-hg
 ALL_TARGET=	${PORTNAME}-helper
 MAKE_ENV=	${:!${MAKE} -V MAKE_ENV -C ${.CURDIR:H}/git!}
 MAKE_ARGS=	SUBMODULE_STATUS=dummy ${:!${MAKE} -V MAKE_ARGS -C ${.CURDIR:H}/git!}
 CFLAGS+=	-ffunction-sections -fdata-sections
 LDFLAGS+=	-Wl,--gc-sections
 .export		CPPFLAGS CFLAGS CXXFLAGS LDFLAGS # :configure
 DATADIR=	${PREFIX}/libexec/git-core
 PORTDATA=	*
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-configure:
 	@${TAR} cf - -C$$(${MAKE} -V WRKSRC -C ${PORTSDIR}/devel/git) . | \
 		${TAR} xof - -C${WRKSRC}/git-core
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${WRKSRC}/git-remote-hg \
 		${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/git-core/${PORTNAME}-helper \
 		${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTNAME:S/git-//}" \
 		${STAGEDIR}${DATADIR}/pythonlib)
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
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/@