summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2023-02-14 22:53:13 +0000
committerGitHub <noreply@github.com>2023-02-14 22:53:13 +0000
commitec501334a361e41aaa63a85422cee9f304edfac7 (patch)
tree5586f409af2dc22e3e6deb96577ce3515baefbfc
parent5b1667a908144e125b10a955b28970869093103f (diff)
parentd2d4b681e22963e430d7b3128474f3f567f311e2 (diff)
downloadlibgit2-maint/v1.4.tar.gz
Merge pull request #6478 from libgit2/ethomson/v1.4.6v1.4.6maint/v1.4
v1.4.6
-rw-r--r--CMakeLists.txt2
-rw-r--r--docs/changelog.md13
-rw-r--r--include/git2/version.h4
-rw-r--r--package.json2
4 files changed, 17 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92bd2db2b..f6ebcf61b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@
cmake_minimum_required(VERSION 3.5.1)
-project(libgit2 VERSION "1.4.5" LANGUAGES C)
+project(libgit2 VERSION "1.4.6" 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 7190777b7..6e0ecaab8 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,3 +1,16 @@
+v1.4.6
+------
+
+This is a bugfix release to improve the SSH key handling functionality
+that was introduced in v1.4.5.
+
+* 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.4 release line are recommended to upgrade.
+
v1.4.5
------
diff --git a/include/git2/version.h b/include/git2/version.h
index 9d5433009..de1ecfc7e 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.4.5"
+#define LIBGIT2_VERSION "1.4.6"
#define LIBGIT2_VER_MAJOR 1
#define LIBGIT2_VER_MINOR 4
-#define LIBGIT2_VER_REVISION 5
+#define LIBGIT2_VER_REVISION 6
#define LIBGIT2_VER_PATCH 0
#define LIBGIT2_SOVERSION "1.4"
diff --git a/package.json b/package.json
index f8715a88d..7fae19618 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "libgit2",
- "version": "1.4.5",
+ "version": "1.4.6",
"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 ."