diff --git a/devel/got/Makefile b/devel/got/Makefile
index de63b7d7be88..3212353d250f 100644
--- a/devel/got/Makefile
+++ b/devel/got/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	got
-PORTVERSION=	0.49
+PORTVERSION=	0.50
 CATEGORIES=	devel
 MASTER_SITES=	https://gameoftrees.org/releases/
 
diff --git a/devel/got/distinfo b/devel/got/distinfo
index c32a6c4f9699..ec5634663f7f 100644
--- a/devel/got/distinfo
+++ b/devel/got/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613049215
-SHA256 (got-0.49.tar.gz) = a6738bcb121ded3d81e7775527defd9c40e1ed1f69ff7207534e6230b8bc9d84
-SIZE (got-0.49.tar.gz) = 484890
+TIMESTAMP = 1616425596
+SHA256 (got-0.50.tar.gz) = 55cbfb9e341fb1ef8761593060030438a89c9ae7a5275dbd1aa6a6013cfef899
+SIZE (got-0.50.tar.gz) = 493640
diff --git a/devel/got/files/patch-lib_deltify.c b/devel/got/files/patch-lib_deltify.c
new file mode 100644
index 000000000000..a0ea825d326a
--- /dev/null
+++ b/devel/got/files/patch-lib_deltify.c
@@ -0,0 +1,12 @@
+https://git.gameoftrees.org/gitweb/?p=got.git;a=commitdiff;h=22403ab7111504d4c33872ec85a46d2eaf21a95b
+
+--- lib/deltify.c.orig	2021-03-22 16:14:59 UTC
++++ lib/deltify.c
+@@ -19,6 +19,7 @@
+ #include <sys/queue.h>
+ 
+ #include <assert.h>
++#include <endian.h>
+ #include <errno.h>
+ #include <limits.h>
+ #include <stdint.h>
diff --git a/devel/got/files/patch-lib_worktree.c b/devel/got/files/patch-lib_worktree.c
new file mode 100644
index 000000000000..80921230a6a2
--- /dev/null
+++ b/devel/got/files/patch-lib_worktree.c
@@ -0,0 +1,12 @@
+https://git.gameoftrees.org/gitweb/?p=got.git;a=commitdiff;h=4cc1f028ad995562d5037a1c8c54a241956d9dbb
+
+--- lib/worktree.c.orig	2021-03-23 14:40:09 UTC
++++ lib/worktree.c
+@@ -1733,6 +1733,7 @@ get_file_status(unsigned char *status, struct stat *sb
+ 	unsigned char staged_status = get_staged_status(ie);
+ 
+ 	*status = GOT_STATUS_NO_CHANGE;
++	memset(sb, 0, sizeof(*sb));
+ 
+ 	/*
+ 	 * Whenever the caller provides a directory descriptor and a
diff --git a/devel/got/files/patch-regress_Makefile b/devel/got/files/patch-regress_Makefile
index df777163fbf8..4e9eb445defa 100644
--- a/devel/got/files/patch-regress_Makefile
+++ b/devel/got/files/patch-regress_Makefile
@@ -1,7 +1,7 @@
---- regress/Makefile.orig	2020-09-13 22:58:33 UTC
+--- regress/Makefile.orig	2021-03-16 21:43:57 UTC
 +++ regress/Makefile
 @@ -1,3 +1,5 @@
- SUBDIR = cmdline delta idset path fetch
+ SUBDIR = cmdline delta deltify idset path fetch
  
 +SUBDIR_TARGETS+= regress
 +
diff --git a/devel/got/files/patch-regress_cmdline_commit.sh b/devel/got/files/patch-regress_cmdline_commit.sh
new file mode 100644
index 000000000000..3b2694160e7e
--- /dev/null
+++ b/devel/got/files/patch-regress_cmdline_commit.sh
@@ -0,0 +1,11 @@
+--- regress/cmdline/commit.sh.orig	2021-03-22 15:59:28 UTC
++++ regress/cmdline/commit.sh
+@@ -1376,7 +1376,7 @@ test_commit_prepared_logmsg() {
+ 
+ 	cat > $testroot/editor.sh <<EOF
+ #!/bin/sh
+-sed -i 's/foo/bar/' "\$1"
++sed -i '' 's/foo/bar/' "\$1"
+ EOF
+ 	chmod +x $testroot/editor.sh
+ 
diff --git a/devel/got/files/patch-regress_cmdline_common.sh b/devel/got/files/patch-regress_cmdline_common.sh
index 4c491a070b89..fe56acb5f345 100644
--- a/devel/got/files/patch-regress_cmdline_common.sh
+++ b/devel/got/files/patch-regress_cmdline_common.sh
@@ -1,6 +1,6 @@
---- regress/cmdline/common.sh.orig	2020-10-13 22:33:10 UTC
+--- regress/cmdline/common.sh.orig	2021-03-22 10:05:11 UTC
 +++ regress/cmdline/common.sh
-@@ -25,6 +25,20 @@ export GOT_TEST_ROOT="/tmp"
+@@ -26,6 +26,20 @@ export GOT_TEST_ROOT="/tmp"
  
  export MALLOC_OPTIONS=S
  
diff --git a/devel/got/files/patch-regress_cmdline_histedit.sh b/devel/got/files/patch-regress_cmdline_histedit.sh
index 5459b7681b94..4442745ef999 100644
--- a/devel/got/files/patch-regress_cmdline_histedit.sh
+++ b/devel/got/files/patch-regress_cmdline_histedit.sh
@@ -1,6 +1,6 @@
---- regress/cmdline/histedit.sh.orig	2020-12-13 15:08:45 UTC
+--- regress/cmdline/histedit.sh.orig	2021-03-22 10:05:11 UTC
 +++ regress/cmdline/histedit.sh
-@@ -1468,7 +1468,7 @@ test_histedit_fold_only() {
+@@ -1507,7 +1507,7 @@ test_histedit_fold_only() {
  
  	cat > $testroot/editor.sh <<EOF
  #!/bin/sh
@@ -9,7 +9,7 @@
  EOF
  	chmod +x $testroot/editor.sh
  
-@@ -1584,7 +1584,7 @@ test_histedit_fold_only_empty_logmsg() {
+@@ -1623,7 +1623,7 @@ test_histedit_fold_only_empty_logmsg() {
  
  	cat > $testroot/editor.sh <<EOF
  #!/bin/sh
diff --git a/devel/got/files/patch-regress_deltify_Makefile b/devel/got/files/patch-regress_deltify_Makefile
new file mode 100644
index 000000000000..28238d5bb22e
--- /dev/null
+++ b/devel/got/files/patch-regress_deltify_Makefile
@@ -0,0 +1,12 @@
+--- regress/deltify/Makefile.orig	2021-03-22 15:38:56 UTC
++++ regress/deltify/Makefile
+@@ -8,7 +8,7 @@ LDADD = -lz
+ 
+ NOMAN = yes
+ 
+-run-regress-deltify_test:
++regress: ${PROG} .PHONY
+ 	${.OBJDIR}/deltify_test -q
+ 
+-.include <bsd.regress.mk>
++.include <bsd.prog.mk>