diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2023-02-15 10:03:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-15 10:03:30 +0000 |
| commit | 26c68a273939acc329416c3ef5aa9e61647bbb78 (patch) | |
| tree | 65d99ec72d7f82937a4bb541d8400ec20b1db4c2 | |
| parent | 448de4d6b3bc97017c3899cbc5d62b153f54af1c (diff) | |
| parent | 914c680e1334eb7ed149dcfea6f5815fdd73f841 (diff) | |
| download | libgit2-maint/v1.5.tar.gz | |
Merge pull request #6477 from libgit2/ethomson/v1.5.2v1.5.2maint/v1.5
v1.5.2
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | docs/changelog.md | 13 | ||||
| -rw-r--r-- | include/git2/version.h | 4 | ||||
| -rw-r--r-- | package.json | 2 |
4 files changed, 17 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e76fc129a..d9c3bc5f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.5.1) -project(libgit2 VERSION "1.5.1" LANGUAGES C) +project(libgit2 VERSION "1.5.2" LANGUAGES C) # Add find modules to the path set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake") diff --git a/docs/changelog.md b/docs/changelog.md index 448a8a0ff..5ae36b1d4 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,3 +1,16 @@ +v1.5.2 +------ + +This is a bugfix release to improve the SSH key handling functionality +that was introduced in v1.5.1. + +* libgit2 can now read the `known_hosts` file on Windows. +* libgit2 will now examine all keys for a particular host in the + `known_hosts` file for matches, to support remote hosts with + multiple key types. + +All users of the v1.5 release line are recommended to upgrade. + v1.5.1 ------ diff --git a/include/git2/version.h b/include/git2/version.h index 944d74365..27849a1e9 100644 --- a/include/git2/version.h +++ b/include/git2/version.h @@ -11,7 +11,7 @@ * The version string for libgit2. This string follows semantic * versioning (v2) guidelines. */ -#define LIBGIT2_VERSION "1.5.1" +#define LIBGIT2_VERSION "1.5.2" /** The major version number for this version of libgit2. */ #define LIBGIT2_VER_MAJOR 1 @@ -20,7 +20,7 @@ #define LIBGIT2_VER_MINOR 5 /** The revision ("teeny") version number for this version of libgit2. */ -#define LIBGIT2_VER_REVISION 1 +#define LIBGIT2_VER_REVISION 2 /** The Windows DLL patch number for this version of libgit2. */ #define LIBGIT2_VER_PATCH 0 diff --git a/package.json b/package.json index 8e8176f22..c76b3726c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "libgit2", - "version": "1.5.1", + "version": "1.5.2", "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 ." |