summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2017-06-11 12:32:00 +0100
committerGitHub <noreply@github.com>2017-06-11 12:32:00 +0100
commitbd6928096d7a4c8f26b55a1e9ec710faeee7db93 (patch)
tree560df6b389c3f396b0396bbaab4b98fff1aa78d5
parent29ef7d3f3bb59b1d7896d84de76b5ea93392da90 (diff)
parent2a3cc403bd5c331b1601e01d54e3f04ace52a07e (diff)
downloadlibgit2-bd6928096d7a4c8f26b55a1e9ec710faeee7db93.tar.gz
Merge pull request #4262 from libgit2/ethomson/bump-v26v0.26.0-rc1
Update version number to 0.26
-rw-r--r--CHANGELOG.md24
-rw-r--r--include/git2/version.h6
2 files changed, 22 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 499121f48..1b9e0c90a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
-v0.25 + 1
--------
+v0.26 + 1
+---------
+
+### Changes or improvements
+
+### API additions
+
+### API removals
+
+### Breaking API changes
+
+v0.26
+-----
### Changes or improvements
@@ -24,12 +35,17 @@ v0.25 + 1
* We now optionally call `fsync` on loose objects, packfiles and their indexes,
loose references and packed reference files.
-* We can now build against OpenSSL v1.1.
+* We can now build against OpenSSL v1.1 and against LibreSSL.
* `GIT_MERGE_OPTIONS_INIT` now includes a setting to perform rename detection.
This aligns this structure with the default by `git_merge` and
`git_merge_trees` when `NULL` was provided for the options.
+* Improvements for reading index v4 files.
+
+* Perform additional retries for filesystem operations on Windows when files
+ are temporarily locked by other processes.
+
### API additions
* New family of functions to handle worktrees:
@@ -80,8 +96,6 @@ v0.25 + 1
* `git_transport_smart_proxy_options()' enables you to get the proxy options for
smart transports.
-### API removals
-
### Breaking API changes
* `clone_checkout_strategy` has been removed from
diff --git a/include/git2/version.h b/include/git2/version.h
index 0df191f4f..becf97bd5 100644
--- a/include/git2/version.h
+++ b/include/git2/version.h
@@ -7,12 +7,12 @@
#ifndef INCLUDE_git_version_h__
#define INCLUDE_git_version_h__
-#define LIBGIT2_VERSION "0.25.0"
+#define LIBGIT2_VERSION "0.26.0"
#define LIBGIT2_VER_MAJOR 0
-#define LIBGIT2_VER_MINOR 25
+#define LIBGIT2_VER_MINOR 26
#define LIBGIT2_VER_REVISION 0
#define LIBGIT2_VER_PATCH 0
-#define LIBGIT2_SOVERSION 25
+#define LIBGIT2_SOVERSION 26
#endif