Index: devel/arcanist-lib/Makefile
===================================================================
--- devel/arcanist-lib/Makefile
+++ devel/arcanist-lib/Makefile
@@ -1,6 +1,6 @@
 PORTNAME?=	arcanist
 PORTVERSION?=	20220518
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES?=	devel
 PKGNAMESUFFIX=	${SLAVE_PKGNAMESUFFIX}${PHP_PKGNAMESUFFIX}
 
Index: devel/arcanist-lib/files/patch-src_workflow_ArcanistDiffWorkflow.php
===================================================================
--- /dev/null
+++ devel/arcanist-lib/files/patch-src_workflow_ArcanistDiffWorkflow.php
@@ -0,0 +1,11 @@
+--- src/workflow/ArcanistDiffWorkflow.php.orig	2023-01-09 21:24:25 UTC
++++ src/workflow/ArcanistDiffWorkflow.php
+@@ -2361,7 +2361,7 @@ EOTEXT
+ 
+     // If we track an upstream branch either directly or indirectly, use that.
+     $branch = $api->getBranchName();
+-    if (strlen($branch)) {
++    if (strlen($branch ?? '')) {
+       $upstream_path = $api->getPathToUpstream($branch);
+       $remote_branch = $upstream_path->getRemoteBranchName();
+       if ($remote_branch !== null) {