summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2023-04-12 13:05:25 +0100
committerGitHub <noreply@github.com>2023-04-12 13:05:25 +0100
commite6325351ceee58cf56f58bdce61b38907805544f (patch)
tree3e0e9ecbf5234f366401f518802e001127b0c44c
parente3ca080794404f563416c4c6f11cd23d54eb113a (diff)
parentbd24d800b0abf3dfc894897210e242c5714d12b2 (diff)
downloadlibgit2-maint/v1.6.tar.gz
Merge pull request #6548 from libgit2/ethomson/v1.6.4v1.6.4maint/v1.6
v1.6.4 with a fix for ProgramData configs on Windows
-rw-r--r--CMakeLists.txt2
-rw-r--r--docs/changelog.md10
-rw-r--r--include/git2/version.h4
-rw-r--r--package.json2
4 files changed, 14 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94627f54d..1f2e02367 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@
cmake_minimum_required(VERSION 3.5.1)
-project(libgit2 VERSION "1.6.3" LANGUAGES C)
+project(libgit2 VERSION "1.6.4" 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 20e48a084..d970b48e9 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,3 +1,13 @@
+v1.6.4
+------
+
+## What's Changed
+
+### Bug fixes
+* config: return `GIT_ENOTFOUND` for missing programdata by @ethomson in https://github.com/libgit2/libgit2/pull/6547
+
+**Full Changelog**: https://github.com/libgit2/libgit2/compare/v1.6.3...v1.6.4
+
v1.6.3
------
diff --git a/include/git2/version.h b/include/git2/version.h
index 78750740a..97221e459 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.6.3"
+#define LIBGIT2_VERSION "1.6.4"
/** The major version number for this version of libgit2. */
#define LIBGIT2_VER_MAJOR 1
@@ -20,7 +20,7 @@
#define LIBGIT2_VER_MINOR 6
/** The revision ("teeny") version number for this version of libgit2. */
-#define LIBGIT2_VER_REVISION 3
+#define LIBGIT2_VER_REVISION 4
/** The Windows DLL patch number for this version of libgit2. */
#define LIBGIT2_VER_PATCH 0
diff --git a/package.json b/package.json
index 5665b4edd..9695f90d9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "libgit2",
- "version": "1.6.3",
+ "version": "1.6.4",
"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 ."