summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2021-06-30 13:35:07 -0500
committerGitHub <noreply@github.com>2021-06-30 13:35:07 -0500
commit8a0dc6783c340e61a44c179c48f832165ad2053c (patch)
treee386d053a1fd3465035a39b9c9f1f765ed290f48
parentdeb1ce4c163bdc109fc5ef7c42f444e2f6eb1fdc (diff)
parent9a3a7c1f802c0cff44c0bda36232fdbe14f4d00d (diff)
downloadlibgit2-maint/v1.1.tar.gz
Merge pull request #5931 from libgit2/ethomson/1.1.1v1.1.1maint/v1.1
Release v1.1.1
-rw-r--r--CMakeLists.txt2
-rw-r--r--README.md7
-rw-r--r--docs/changelog.md28
-rw-r--r--include/git2/version.h4
-rw-r--r--package.json2
5 files changed, 35 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6f23cf6b..a46eca529 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1)
-project(libgit2 VERSION "1.1.0" LANGUAGES C)
+project(libgit2 VERSION "1.1.1" LANGUAGES C)
# Add find modules to the path
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${libgit2_SOURCE_DIR}/cmake/")
diff --git a/README.md b/README.md
index a91f16067..1a1354340 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,9 @@ libgit2 - the Git linkable library
| Build Status | |
| ------------ | - |
-| **master** branch CI builds | [![Azure Pipelines Build Status](https://dev.azure.com/libgit2/libgit2/_apis/build/status/libgit2?branchName=master)](https://dev.azure.com/libgit2/libgit2/_build/latest?definitionId=7&branchName=master) |
-| **v1.0 branch** CI builds | [![Azure Pipelines Build Status](https://dev.azure.com/libgit2/libgit2/_apis/build/status/libgit2?branchName=maint/v1.0)](https://dev.azure.com/libgit2/libgit2/_build/latest?definitionId=7&branchName=maint/v1.0) |
-| **v0.28 branch** CI builds | [![Azure Pipelines Build Status](https://dev.azure.com/libgit2/libgit2/_apis/build/status/libgit2?branchName=maint/v0.28)](https://dev.azure.com/libgit2/libgit2/_build/latest?definitionId=7&branchName=maint/v0.28) |
-| **Nightly** builds | [![Azure Pipelines Build Status](https://libgit2.visualstudio.com/libgit2/_apis/build/status/nightly?branchName=master&label=Full+Build)](https://libgit2.visualstudio.com/libgit2/_build/latest?definitionId=9&branchName=master) [![Coverity Build Status](https://dev.azure.com/libgit2/libgit2/_apis/build/status/coverity?branchName=master&label=Coverity+Build)](https://dev.azure.com/libgit2/libgit2/_build/latest?definitionId=21?branchName=master) [![Coverity Scan Build Status](https://scan.coverity.com/projects/639/badge.svg)](https://scan.coverity.com/projects/639) |
+| Build Status | |
+| ------------ | - |
+| **v1.1 branch** CI builds | [![CI Build](https://github.com/libgit2/libgit2/workflows/CI%20Build/badge.svg?branch=maint%2Fv1.1&event=push)](https://github.com/libgit2/libgit2/actions?query=workflow%3A%22CI+Build%22+event%3Apush+branch%3Amaint%2Fv1.1) |
`libgit2` is a portable, pure C implementation of the Git core methods
provided as a linkable library with a solid API, allowing to build Git
diff --git a/docs/changelog.md b/docs/changelog.md
index 288ef2d11..12e722f1b 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,3 +1,31 @@
+v1.1.1
+------
+
+This is a bugfix release with the following changes:
+
+* Fixes a bug where decompressing packfiles could fail in rare
+ instances.
+
+* Ensure worktree paths are validated in more cases.
+
+* Builds without thread-safety (`THREADSAFE=OFF`) are supported again.
+
+* Builds without mmap (`NO_MMAP`) are supported again.
+
+* mbedTLS is supported in non-default locations.
+
+* Malformed branch names or missing branches on remotes are ignored.
+
+* Use compiler intrinsics to detect arithmetic overflows in more cases.
+
+* The configuration cache functions properly on systems with strict
+ alignment.
+
+* A missing options initializer function (`git_blob_filter_options_init`)
+ was added for `git_blob_filter_options`.
+
+* Several documentation fixes.
+
v1.1
----
diff --git a/include/git2/version.h b/include/git2/version.h
index c1020bbea..7b549b042 100644
--- a/include/git2/version.h
+++ b/include/git2/version.h
@@ -7,10 +7,10 @@
#ifndef INCLUDE_git_version_h__
#define INCLUDE_git_version_h__
-#define LIBGIT2_VERSION "1.1.0"
+#define LIBGIT2_VERSION "1.1.1"
#define LIBGIT2_VER_MAJOR 1
#define LIBGIT2_VER_MINOR 1
-#define LIBGIT2_VER_REVISION 0
+#define LIBGIT2_VER_REVISION 1
#define LIBGIT2_VER_PATCH 0
#define LIBGIT2_SOVERSION "1.1"
diff --git a/package.json b/package.json
index 5e74f3bd5..40f858eb0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "libgit2",
- "version": "1.1.0",
+ "version": "1.1.1",
"repo": "https://github.com/libgit2/libgit2",
"description": " A cross-platform, linkable library implementation of Git that you can use in your application.",
"install": "mkdir build && cd build && cmake .. && cmake --build ."