diff --git a/devel/got/Makefile b/devel/got/Makefile
index 3b6b1f8d8ac5..f86398e206e9 100644
--- a/devel/got/Makefile
+++ b/devel/got/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	got
-PORTVERSION=	0.79
+PORTVERSION=	0.80
 CATEGORIES=	devel
 MASTER_SITES=	https://gameoftrees.org/releases/
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Game of Trees version control system
 WWW=		https://gameoftrees.org
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 USES=		uidfix
 
 CONFLICTS_INSTALL=	p5-App-GitGot
 
 # Insert #include "openbsd-compat.h" into each source file,
 # after the <...> includes and before the "..." ones.
 n=		${.newline}
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.[cy]' -exec \
 	    ${REINPLACE_CMD} '1,/^#include "/{ \
 	    /^#include "/i\$n#include "openbsd-compat.h"\$n$n}' \
 	    {} +
 	${CP} -R ${FILESDIR}/openbsd-compat ${WRKSRC}
 
 # The regression test suite requires:
 #  installed got
 #  installed git
 #  ssh to 127.0.0.1
 regress:
 	@(cd ${WRKSRC}/regress && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} regress)
 
 .include <bsd.port.mk>
diff --git a/devel/got/distinfo b/devel/got/distinfo
index 9982df3775e6..44ba8d36a38f 100644
--- a/devel/got/distinfo
+++ b/devel/got/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667941319
-SHA256 (got-0.79.tar.gz) = 1ae304e36a49c8ed0e9dfeeaf3e610d1423cbc747ec08a989d42bf43044e3ef0
-SIZE (got-0.79.tar.gz) = 843921
+TIMESTAMP = 1673988392
+SHA256 (got-0.80.tar.gz) = e927d0ebb6d10cdf170cf2dde7a1be20551cd44ac35cf012248260a809222bad
+SIZE (got-0.80.tar.gz) = 784764
diff --git a/devel/got/files/patch-regress_cmdline_diff.sh b/devel/got/files/patch-regress_cmdline_diff.sh
new file mode 100644
index 000000000000..e17f2bb3e014
--- /dev/null
+++ b/devel/got/files/patch-regress_cmdline_diff.sh
@@ -0,0 +1,15 @@
+--- regress/cmdline/diff.sh.orig	2023-01-16 08:47:29 UTC
++++ regress/cmdline/diff.sh
+@@ -1762,10 +1762,8 @@ EOF
+ 		return 1
+ 	fi
+ 
+-	typeset -L10 short_alpha_id
+-	typeset -L10 short_alpha_new_id
+-	short_alpha_id=$alpha_blobid
+-	short_alpha_new_id=$alpha_new_blobid
++	short_alpha_id=$(printf '%-10.10s' $alpha_blobid)
++	short_alpha_new_id=$(printf '%-10.10s' $alpha_new_blobid)
+ 	cat <<EOF >$testroot/stdout.expected
+ diffstat $alpha_blobid $alpha_new_blobid
+  M  $short_alpha_id -> $short_alpha_new_id  |  1+  1-