git: 7aa38c747cf3 - main - devel/got: update to 0.116

The branch main has been updated by naddy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7aa38c747cf3dc03b32028a61e0b46aa6413df92

commit 7aa38c747cf3dc03b32028a61e0b46aa6413df92
Author:     Christian Weisgerber <naddy@FreeBSD.org>
AuthorDate: 2025-07-26 20:29:36 +0000
Commit:     Christian Weisgerber <naddy@FreeBSD.org>
CommitDate: 2025-07-26 20:42:28 +0000

    devel/got: update to 0.116
    
    User-visible changes:
    - make our pack-refs header format align with the expectations of git 2.50.0
    - pick a default branch to clone when the server does not advertise HEAD symref
    - do not clobber changes staged via stage -p during "got revert"
---
 devel/got/Makefile                              |  2 +-
 devel/got/distinfo                              |  6 ++---
 devel/got/files/patch-lib_delta.c               | 22 ++++++++++++++++
 devel/got/files/patch-regress_cmdline_revert.sh | 34 +++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/devel/got/Makefile b/devel/got/Makefile
index 84925b9116b3..5329e0ee2e49 100644
--- a/devel/got/Makefile
+++ b/devel/got/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	got
-DISTVERSION=	0.115
+DISTVERSION=	0.116
 CATEGORIES=	devel
 MASTER_SITES=	https://gameoftrees.org/releases/portable/
 DISTNAME=	got-portable-${DISTVERSION}
diff --git a/devel/got/distinfo b/devel/got/distinfo
index f8780a4edd9e..5a6b28308884 100644
--- a/devel/got/distinfo
+++ b/devel/got/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751058753
-SHA256 (got-portable-0.115.tar.gz) = adf0bc1cc374747df8fb525b777b8f12d1bfd6e893752281922961b2c88989e7
-SIZE (got-portable-0.115.tar.gz) = 1579926
+TIMESTAMP = 1753530816
+SHA256 (got-portable-0.116.tar.gz) = e8a64ad73b82c1b6df9df9da5a3e8da9be6051c3497379940806878d958e4dff
+SIZE (got-portable-0.116.tar.gz) = 1585985
diff --git a/devel/got/files/patch-lib_delta.c b/devel/got/files/patch-lib_delta.c
new file mode 100644
index 000000000000..5ff416b141d7
--- /dev/null
+++ b/devel/got/files/patch-lib_delta.c
@@ -0,0 +1,22 @@
+--- lib/delta.c.orig	2025-07-26 10:40:07 UTC
++++ lib/delta.c
+@@ -321,7 +321,8 @@ got_delta_apply_in_mem(uint8_t *base_buf, size_t base_
+ 	if (err == NULL && *outsize != result_size)
+ 		err = got_error_fmt(GOT_ERR_BAD_DELTA,
+ 		    "delta application result size mismatch: actual: %zd "
+-		    "expected: %llu", *outsize, result_size);
++		    "expected: %llu", *outsize,
++		    (unsigned long long)result_size);
+ 
+ 	return err;
+ }
+@@ -390,7 +391,8 @@ got_delta_apply(FILE *base_file, const uint8_t *delta_
+ 	if (err == NULL && *outsize != result_size)
+ 		err = got_error_fmt(GOT_ERR_BAD_DELTA,
+ 		    "delta application result size mismatch: actual: %zd "
+-		    "expected: %llu", *outsize, result_size);
++		    "expected: %llu", *outsize,
++		    (unsigned long long)result_size);
+ 
+ 	if (memstream != NULL) {
+ 		if (fclose(memstream) == EOF && err == NULL)
diff --git a/devel/got/files/patch-regress_cmdline_revert.sh b/devel/got/files/patch-regress_cmdline_revert.sh
new file mode 100644
index 000000000000..7da38092cfe8
--- /dev/null
+++ b/devel/got/files/patch-regress_cmdline_revert.sh
@@ -0,0 +1,34 @@
+--- regress/cmdline/revert.sh.orig	2025-07-22 08:18:04 UTC
++++ regress/cmdline/revert.sh
+@@ -1884,9 +1884,12 @@ test_revert_staged_file() {
+ 		> /dev/null)
+ 	local commit_id=`git_show_head $testroot/repo`
+ 
+-	sed -i -e 's/line 0/line 0a/' $testroot/wt/epsilon/zeta
+-	sed -i -e 's/line 4/line 4a/' $testroot/wt/epsilon/zeta
+-	sed -i -e 's/line 6/line 6a/' $testroot/wt/epsilon/zeta
++	ed -s $testroot/wt/epsilon/zeta <<-\EOF
++	,s/line 0/line 0a/
++	,s/line 4/line 4a/
++	,s/line 6/line 6a/
++	w
++	EOF
+ 
+ 	# stage line 0 and line 6
+ 	printf "y\n" > $testroot/patchscript
+@@ -1991,9 +1994,12 @@ test_revert_partially_staged_file() {
+ 		> /dev/null)
+ 	local commit_id=`git_show_head $testroot/repo`
+ 
+-	sed -i -e 's/line 0/line 0a/' $testroot/wt/epsilon/zeta
+-	sed -i -e 's/line 4/line 4a/' $testroot/wt/epsilon/zeta
+-	sed -i -e 's/line 6/line 6a/' $testroot/wt/epsilon/zeta
++	ed -s $testroot/wt/epsilon/zeta <<-\EOF
++	,s/line 0/line 0a/
++	,s/line 4/line 4a/
++	,s/line 6/line 6a/
++	w
++	EOF
+ 
+ 	# stage line 0 and line 6
+ 	printf "y\n" > $testroot/patchscript