Merge pull request libgit2#7084 from libgit2/ethomson/v1.9.1

Author: ethomson

.github/workflows/experimental.yml

@@ -113,7 +113,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Download test results
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
     - name: Generate test summary
       uses: test-summary/action@v2
       with:

AUTHORS

@@ -70,6 +70,7 @@ Shawn O. Pearce
 Shuhei Tanuma
 Steve Frécinaux
 Sven Strickroth
+Talya "kivikakk" Connor
 Tim Branyen
 Tim Clem
 Tim Harder

CMakeLists.txt

@@ -6,7 +6,7 @@
 
 cmake_minimum_required(VERSION 3.5.1)
 
-project(libgit2 VERSION "1.9.0" LANGUAGES C)
+project(libgit2 VERSION "1.9.1" LANGUAGES C)
 
 # Add find modules to the path
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")

cmake/DefaultCFlags.cmake

@@ -56,7 +56,7 @@ if(MSVC)
 	set(CMAKE_C_FLAGS_MINSIZEREL "/DNDEBUG /O1 /Oy /GL /Gy ${CRT_FLAG_RELEASE}")
 
 	# /IGNORE:4221 - Ignore empty compilation units
-	set(CMAKE_STATIC_LINKER_FLAGS "/IGNORE:4221")
+	set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /IGNORE:4221")
 
 	# /DYNAMICBASE - Address space load randomization (ASLR)
 	# /NXCOMPAT - Data execution prevention (DEP)

cmake/SelectSSH.cmake

@@ -42,5 +42,5 @@ elseif(USE_SSH STREQUAL ON OR USE_SSH STREQUAL "libssh2")
 elseif(USE_SSH STREQUAL OFF OR USE_SSH STREQUAL "")
 	add_feature_info(SSH OFF "SSH transport support")
 else()
-	message(FATAL_ERROR "unknown SSH option: ${USE_HTTP_PARSER}")
+	message(FATAL_ERROR "unknown SSH option: ${USE_SSH}")
 endif()

docs/changelog.md

@@ -1,3 +1,93 @@
+v1.9.1
+------
+
+This release includes a number of bugfixes and compatibility
+improvements.
+
+## What's Changed
+
+### Bug fixes
+
+* hash: allow `unsigned int` != `size_t` in sha256 by @ethomson in
+  https://github.com/libgit2/libgit2/pull/6996
+* include: Fix code comment termination by @florianpircher in
+  https://github.com/libgit2/libgit2/pull/6997
+* alternates: allow relative paths in all repositories by @vapier
+  in https://github.com/libgit2/libgit2/pull/7019
+* Fix potential null dereference by @peter15914 in
+  https://github.com/libgit2/libgit2/pull/6998
+* cli: fix undefined alloca() on CYGWIN by @carlo-bramini in
+  https://github.com/libgit2/libgit2/pull/7022
+* attr: honor ignorecase in attribute matching by @ethomson in
+  https://github.com/libgit2/libgit2/pull/7018
+* tag: Refuse to use HEAD as a tagname by @csware in
+  https://github.com/libgit2/libgit2/pull/7061
+* Fix memory leak in openssl fips modes by @wklatka in
+  https://github.com/libgit2/libgit2/pull/7064
+* Fix circular includes between types.h and oid.h by @georgthegreat
+  in https://github.com/libgit2/libgit2/pull/7059
+* diff: correct diff stat alignment in presence of renames w/ common
+  prefix. by @kivikakk in https://github.com/libgit2/libgit2/pull/7057
+* Revert include path regression by @ytnuf in
+  https://github.com/libgit2/libgit2/pull/7039
+
+### Build and CI improvements
+
+* benchmarks: update path to baseline cli by @ethomson in
+  https://github.com/libgit2/libgit2/pull/7006
+* Update SelectSSH.cmake by @lrm29 in
+  https://github.com/libgit2/libgit2/pull/7012
+* ci: update download-artifact version by @ethomson in
+  https://github.com/libgit2/libgit2/pull/7038
+* install cmake files into configured libdir by @kanavin in
+  https://github.com/libgit2/libgit2/pull/7004
+* Test updates by @ethomson in
+  https://github.com/libgit2/libgit2/pull/7025
+* conflict tests: check `core.ignorecase` by @emilazy in
+  https://github.com/libgit2/libgit2/pull/7026
+* Include common.h in version.h by @ethomson in
+  https://github.com/libgit2/libgit2/pull/7030
+* clar: update to latest version by @ethomson in
+  https://github.com/libgit2/libgit2/pull/7029
+* Fix MSVC cross compilation by @Faless in
+  https://github.com/libgit2/libgit2/pull/7079
+* fuzzers: Fix CFLAGS by @nelhage in
+  https://github.com/libgit2/libgit2/pull/7044
+* Avoid duplicate definition of `git_http_auth_dummy`. by
+  @JohannesWilde in https://github.com/libgit2/libgit2/pull/7077
+
+### Documentation improvements
+
+* docs: add `update_refs` as ABI breaking change by @ethomson
+  in https://github.com/libgit2/libgit2/pull/7005
+* docs: correct wrong docstring info for `git_remote_url` by
+  @DominiqueFuchs in https://github.com/libgit2/libgit2/pull/7076
+
+## New Contributors
+
+* @peter15914 made their first contribution in
+  https://github.com/libgit2/libgit2/pull/6998
+* @kanavin made their first contribution in
+  https://github.com/libgit2/libgit2/pull/7004
+* @carlo-bramini made their first contribution in
+  https://github.com/libgit2/libgit2/pull/7022
+* @vapier made their first contribution in
+  https://github.com/libgit2/libgit2/pull/7019
+* @emilazy made their first contribution in
+  https://github.com/libgit2/libgit2/pull/7026
+* @ytnuf made their first contribution in
+  https://github.com/libgit2/libgit2/pull/7039
+* @DominiqueFuchs made their first contribution in
+  https://github.com/libgit2/libgit2/pull/7076
+* @wklatka made their first contribution in
+  https://github.com/libgit2/libgit2/pull/7064
+* @kivikakk made their first contribution in
+  https://github.com/libgit2/libgit2/pull/7057
+* @JohannesWilde made their first contribution in
+  https://github.com/libgit2/libgit2/pull/7077
+
+**Full Changelog**: https://github.com/libgit2/libgit2/compare/v1.9.0...v1.9.1
+
 v1.9.0
 ------
 
@@ -71,6 +161,13 @@ maintainers of bindings or FFI users, may want to be aware of.
   to provide a mechanism to nicely free the configuration entries that
   they provide.
 
+* **`update_refs` callback for remotes** (ABI breaking change)
+  The `update_refs` callback was added to the `git_remote_callbacks`
+  structure to provide additional information about updated refs;
+  in particular, the `git_refspec` is included for more information
+  about the remote ref. The `update_refs` callback will be
+  preferred over the now deprecated `update_tips` callback.
+
 ## What's Changed
 
 ### New features

fuzzers/CMakeLists.txt

@@ -2,7 +2,6 @@
 
 if(BUILD_FUZZERS AND NOT USE_STANDALONE_FUZZERS)
 	set(CMAKE_REQUIRED_FLAGS "-fsanitize=fuzzer-no-link")
-	add_c_flag(-fsanitize=fuzzer)
 	add_c_flag(-fsanitize=fuzzer-no-link)
 	unset(CMAKE_REQUIRED_FLAGS)
 endif()
@@ -24,6 +23,9 @@ foreach(fuzz_target_src ${SRC_FUZZERS})
 	target_include_directories(${fuzz_target_name} SYSTEM PRIVATE ${LIBGIT2_SYSTEM_INCLUDES})
 
 	target_link_libraries(${fuzz_target_name} ${LIBGIT2_SYSTEM_LIBS})
+	if(NOT USE_STANDALONE_FUZZERS)
+		target_link_options(${fuzz_target_name} PRIVATE "-fsanitize=fuzzer")
+	endif()
 
 	add_test(${fuzz_target_name} "${CMAKE_CURRENT_BINARY_DIR}/${fuzz_target_name}" "${CMAKE_CURRENT_SOURCE_DIR}/corpora/${fuzz_name}")
 endforeach()

include/git2/oid.h

@@ -8,7 +8,6 @@
 #define INCLUDE_git_oid_h__
 
 #include "common.h"
-#include "types.h"
 #include "experimental.h"
 
 /**

include/git2/remote.h

@@ -249,9 +249,9 @@ GIT_EXTERN(const char *) git_remote_name(const git_remote *remote);
 /**
  * Get the remote's url
  *
- * If url.*.insteadOf has been configured for this URL, it will
- * return the modified URL.  If `git_remote_set_instance_pushurl`
- * has been called for this remote, then that URL will be returned.
+ * If url.*.insteadOf has been configured for this URL, it will return
+ * the modified URL. This function does not consider if a push url has
+ * been configured for this remote (use `git_remote_pushurl` if needed).
  *
  * @param remote the remote
  * @return a pointer to the url

include/git2/stdint.h

@@ -221,7 +221,7 @@ typedef uint64_t  uintmax_t;
 #endif /* __STDC_LIMIT_MACROS ] */
 
 
-/* 7.18.4 Limits of other integer types
+/* 7.18.4 Limits of other integer types */
 
 #if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) /* [    See footnote 224 at page 260 */