diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-21 05:03:05 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-21 05:03:05 +0000 |
commit | 5de8855907286ccaaf7bb25081c93d5e75d43f07 (patch) | |
tree | 95330536dc71887a4e412b83ccd29fc9e9177f91 /debian/patches | |
parent | Merging upstream version 1.8.1+ds. (diff) | |
download | libgit2-debian.tar.xz libgit2-debian.zip |
Adding debian version 1.8.1+ds-1.debian/1.8.1+ds-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/disable-flaky-stat-tests.patch | 2 | ||||
-rw-r--r-- | debian/patches/handle-bashism.patch | 19 | ||||
-rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 21 deletions
diff --git a/debian/patches/disable-flaky-stat-tests.patch b/debian/patches/disable-flaky-stat-tests.patch index 02ef286..9b422a0 100644 --- a/debian/patches/disable-flaky-stat-tests.patch +++ b/debian/patches/disable-flaky-stat-tests.patch @@ -11,7 +11,7 @@ Forwarded: not-needed 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/tests/libgit2/repo/init.c b/tests/libgit2/repo/init.c -index d78ec06..17a0ae2 100644 +index 446ab73..8cf7320 100644 --- a/tests/libgit2/repo/init.c +++ b/tests/libgit2/repo/init.c @@ -443,12 +443,14 @@ void test_repo_init__extended_1(void) diff --git a/debian/patches/handle-bashism.patch b/debian/patches/handle-bashism.patch deleted file mode 100644 index 907ccf7..0000000 --- a/debian/patches/handle-bashism.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org> -Date: Sun, 28 Aug 2022 17:42:55 +0200 -Subject: Use bash for shell script with bashisms - -Forwarded: https://github.com/libgit2/libgit2/pull/6581 ---- - tests/resources/push.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/resources/push.sh b/tests/resources/push.sh -index 3e77fb5..54ef3dd 100644 ---- a/tests/resources/push.sh -+++ b/tests/resources/push.sh -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - #creates push_src repo for libgit2 push tests. - set -eu - diff --git a/debian/patches/series b/debian/patches/series index ddeb33d..2d30c22 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ disable-online-tests.patch -handle-bashism.patch disable-flaky-stat-tests.patch |