diff options
Diffstat (limited to 'devel/got/files')
| -rw-r--r-- | devel/got/files/patch-lib_delta.c | 22 | ||||
| -rw-r--r-- | devel/got/files/patch-regress_cmdline_revert.sh | 34 |
2 files changed, 0 insertions, 56 deletions
diff --git a/devel/got/files/patch-lib_delta.c b/devel/got/files/patch-lib_delta.c deleted file mode 100644 index 5ff416b141d7..000000000000 --- a/devel/got/files/patch-lib_delta.c +++ /dev/null @@ -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) diff --git a/devel/got/files/patch-regress_cmdline_revert.sh b/devel/got/files/patch-regress_cmdline_revert.sh deleted file mode 100644 index 7da38092cfe8..000000000000 --- a/devel/got/files/patch-regress_cmdline_revert.sh +++ /dev/null @@ -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 |