devel/got: update to 0.117

User-visible changes:
- preserve bad symlinks across merges during rebase and histedit
- improve binary files detection: detect any control characters, not just NUL
- make 'got clone' set a got.conf default branch for fetching only, not sending
This commit is contained in:
Christian Weisgerber 2025-08-18 20:09:07 +00:00
parent c5573abb35
commit 8e759e81c5
4 changed files with 4 additions and 60 deletions

View File

@ -1,5 +1,5 @@
PORTNAME= got
DISTVERSION= 0.116
DISTVERSION= 0.117
CATEGORIES= devel
MASTER_SITES= https://gameoftrees.org/releases/portable/
DISTNAME= got-portable-${DISTVERSION}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1753530816
SHA256 (got-portable-0.116.tar.gz) = e8a64ad73b82c1b6df9df9da5a3e8da9be6051c3497379940806878d958e4dff
SIZE (got-portable-0.116.tar.gz) = 1585985
TIMESTAMP = 1755546260
SHA256 (got-portable-0.117.tar.gz) = 8d53ffd6f5f5749ba474753e47e45e8e53d57de541be8bb3b0ce8e8fc233c141
SIZE (got-portable-0.117.tar.gz) = 2497749

View File

@ -1,22 +0,0 @@
--- 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)

View File

@ -1,34 +0,0 @@
--- 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