diff options
| -rw-r--r-- | ci/docker/centos7 | 2 | ||||
| -rw-r--r-- | ci/docker/centos8 | 2 | ||||
| -rw-r--r-- | ci/docker/focal | 3 | ||||
| -rw-r--r-- | ci/docker/xenial | 3 | ||||
| -rw-r--r-- | src/email.c | 1 | ||||
| -rw-r--r-- | tests/rebase/sign.c | 14 |
6 files changed, 11 insertions, 14 deletions
diff --git a/ci/docker/centos7 b/ci/docker/centos7 index 098edb26a..8105f1442 100644 --- a/ci/docker/centos7 +++ b/ci/docker/centos7 @@ -18,7 +18,7 @@ RUN yum install -y \ FROM yum AS libssh2 RUN cd /tmp && \ - curl https://libssh2.org/download/libssh2-1.8.0.tar.gz | tar -xz && \ + curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.0.tar.gz | tar -xz && \ cd libssh2-1.8.0 && \ ./configure && \ make && \ diff --git a/ci/docker/centos8 b/ci/docker/centos8 index f47198446..cca088103 100644 --- a/ci/docker/centos8 +++ b/ci/docker/centos8 @@ -20,7 +20,7 @@ RUN yum install -y \ FROM yum AS libssh2 RUN cd /tmp && \ - curl https://libssh2.org/download/libssh2-1.8.0.tar.gz | tar -xz && \ + curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.0.tar.gz | tar -xz && \ cd libssh2-1.8.0 && \ ./configure && \ make && \ diff --git a/ci/docker/focal b/ci/docker/focal index 171387698..37d7d6356 100644 --- a/ci/docker/focal +++ b/ci/docker/focal @@ -49,8 +49,7 @@ RUN cd /tmp && \ FROM mbedtls AS libssh2 RUN cd /tmp && \ - curl --insecure --location --silent --show-error https://www.libssh2.org/download/libssh2-1.9.0.tar.gz | \ - tar -xz && \ + curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.9.0.tar.gz | tar -xz && \ cd libssh2-1.9.0 && \ mkdir build build-msan && \ cd build && \ diff --git a/ci/docker/xenial b/ci/docker/xenial index 4c3810af4..c19fe421d 100644 --- a/ci/docker/xenial +++ b/ci/docker/xenial @@ -41,8 +41,7 @@ RUN cd /tmp && \ FROM mbedtls AS libssh2 RUN cd /tmp && \ - curl --insecure --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.2.tar.gz | \ - tar -xz && \ + curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.2.tar.gz | tar -xz && \ cd libssh2-1.8.2 && \ CFLAGS=-fPIC cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCRYPTO_BACKEND=Libgcrypt . && \ ninja install && \ diff --git a/src/email.c b/src/email.c index 8957d9a38..df63b6ec3 100644 --- a/src/email.c +++ b/src/email.c @@ -217,7 +217,6 @@ int git_email__append_from_diff( memcpy(&opts, given_opts, sizeof(git_email_create_options)); git_buf_sanitize(out); - git_buf_clear(out); if ((error = append_header(out, patch_idx, patch_count, commit_id, summary, author, &opts)) == 0 && (error = append_body(out, body)) == 0 && diff --git a/tests/rebase/sign.c b/tests/rebase/sign.c index 8b0473c3c..06c18937a 100644 --- a/tests/rebase/sign.c +++ b/tests/rebase/sign.c @@ -249,13 +249,7 @@ void test_rebase_sign__create_propagates_error(void) } #ifndef GIT_DEPRECATE_HARD -int signing_cb_passthrough( - git_buf *signature, - git_buf *signature_field, - const char *commit_content, - void *payload) -{ - static const char *expected_commit_content = "\ +static const char *expected_commit_content = "\ tree cd99b26250099fc38d30bfaed7797a7275ed3366\n\ parent f87d14a4a236582a0278a916340a793714256864\n\ author Edward Thomson <ethomson@edwardthomson.com> 1405625055 -0400\n\ @@ -263,6 +257,12 @@ committer Rebaser <rebaser@rebaser.rb> 1405694510 +0000\n\ \n\ Modification 3 to gravy\n"; +int signing_cb_passthrough( + git_buf *signature, + git_buf *signature_field, + const char *commit_content, + void *payload) +{ cl_assert_equal_b(false, git_buf_is_allocated(signature)); cl_assert_equal_b(false, git_buf_is_allocated(signature_field)); cl_assert_equal_s(expected_commit_content, commit_content); |