Bundle 1.7.0-2 (2023-07-19)

README.md

@@ -1,14 +1,14 @@
-# libgit2 1.4.2-2
+# libgit2 1.7.0-2
 
  - mingw-w64-i686-zlib-1.2.11-9100-any.pkg.tar.xz
- - mingw-w64-i686-openssl-1.1.1.m-9800-any.pkg.tar.xz
- - mingw-w64-i686-libssh2-1.11.0-9800-any.pkg.tar.xz
- - mingw-w64-i686-libgit2-1.4.2-2-any.pkg.tar.xz
+ - mingw-w64-i686-openssl-3.1.1-9800-any.pkg.tar.xz
+ - mingw-w64-i686-libssh2-1.11.0-9801-any.pkg.tar.xz
+ - mingw-w64-i686-libgit2-1.7.0-2-any.pkg.tar.xz
  - mingw-w64-x86_64-zlib-1.2.11-9100-any.pkg.tar.xz
- - mingw-w64-x86_64-openssl-1.1.1.m-9800-any.pkg.tar.xz
- - mingw-w64-x86_64-libssh2-1.11.0-9800-any.pkg.tar.xz
- - mingw-w64-x86_64-libgit2-1.4.2-2-any.pkg.tar.xz
+ - mingw-w64-x86_64-openssl-3.1.1-9800-any.pkg.tar.xz
+ - mingw-w64-x86_64-libssh2-1.11.0-9801-any.pkg.tar.xz
+ - mingw-w64-x86_64-libgit2-1.7.0-2-any.pkg.tar.xz
  - mingw-w64-ucrt-x86_64-zlib-1.2.11-9100-any.pkg.tar.xz
- - mingw-w64-ucrt-x86_64-openssl-1.1.1.m-9800-any.pkg.tar.xz
- - mingw-w64-ucrt-x86_64-libssh2-1.11.0-9800-any.pkg.tar.xz
- - mingw-w64-ucrt-x86_64-libgit2-1.4.2-2-any.pkg.tar.xz
+ - mingw-w64-ucrt-x86_64-openssl-3.1.1-9800-any.pkg.tar.xz
+ - mingw-w64-ucrt-x86_64-libssh2-1.11.0-9801-any.pkg.tar.xz
+ - mingw-w64-ucrt-x86_64-libgit2-1.7.0-2-any.pkg.tar.xz

include/git2.h

@@ -1,73 +1,74 @@
-/*
- * Copyright (C) the libgit2 contributors. All rights reserved.
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-
-#ifndef INCLUDE_git_git_h__
-#define INCLUDE_git_git_h__
-
-#include "git2/annotated_commit.h"
-#include "git2/apply.h"
-#include "git2/attr.h"
-#include "git2/blob.h"
-#include "git2/blame.h"
-#include "git2/branch.h"
-#include "git2/buffer.h"
-#include "git2/cert.h"
-#include "git2/checkout.h"
-#include "git2/cherrypick.h"
-#include "git2/clone.h"
-#include "git2/commit.h"
-#include "git2/common.h"
-#include "git2/config.h"
-#include "git2/credential.h"
-#include "git2/deprecated.h"
-#include "git2/describe.h"
-#include "git2/diff.h"
-#include "git2/email.h"
-#include "git2/errors.h"
-#include "git2/filter.h"
-#include "git2/global.h"
-#include "git2/graph.h"
-#include "git2/ignore.h"
-#include "git2/index.h"
-#include "git2/indexer.h"
-#include "git2/mailmap.h"
-#include "git2/merge.h"
-#include "git2/message.h"
-#include "git2/net.h"
-#include "git2/notes.h"
-#include "git2/object.h"
-#include "git2/odb.h"
-#include "git2/odb_backend.h"
-#include "git2/oid.h"
-#include "git2/pack.h"
-#include "git2/patch.h"
-#include "git2/pathspec.h"
-#include "git2/proxy.h"
-#include "git2/rebase.h"
-#include "git2/refdb.h"
-#include "git2/reflog.h"
-#include "git2/refs.h"
-#include "git2/refspec.h"
-#include "git2/remote.h"
-#include "git2/repository.h"
-#include "git2/reset.h"
-#include "git2/revert.h"
-#include "git2/revparse.h"
-#include "git2/revwalk.h"
-#include "git2/signature.h"
-#include "git2/stash.h"
-#include "git2/status.h"
-#include "git2/submodule.h"
-#include "git2/tag.h"
-#include "git2/transport.h"
-#include "git2/transaction.h"
-#include "git2/tree.h"
-#include "git2/types.h"
-#include "git2/version.h"
-#include "git2/worktree.h"
-
-#endif
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#ifndef INCLUDE_git_git_h__
+#define INCLUDE_git_git_h__
+
+#include "git2/annotated_commit.h"
+#include "git2/apply.h"
+#include "git2/attr.h"
+#include "git2/blob.h"
+#include "git2/blame.h"
+#include "git2/branch.h"
+#include "git2/buffer.h"
+#include "git2/cert.h"
+#include "git2/checkout.h"
+#include "git2/cherrypick.h"
+#include "git2/clone.h"
+#include "git2/commit.h"
+#include "git2/common.h"
+#include "git2/config.h"
+#include "git2/credential.h"
+#include "git2/deprecated.h"
+#include "git2/describe.h"
+#include "git2/diff.h"
+#include "git2/email.h"
+#include "git2/errors.h"
+#include "git2/experimental.h"
+#include "git2/filter.h"
+#include "git2/global.h"
+#include "git2/graph.h"
+#include "git2/ignore.h"
+#include "git2/index.h"
+#include "git2/indexer.h"
+#include "git2/mailmap.h"
+#include "git2/merge.h"
+#include "git2/message.h"
+#include "git2/net.h"
+#include "git2/notes.h"
+#include "git2/object.h"
+#include "git2/odb.h"
+#include "git2/odb_backend.h"
+#include "git2/oid.h"
+#include "git2/pack.h"
+#include "git2/patch.h"
+#include "git2/pathspec.h"
+#include "git2/proxy.h"
+#include "git2/rebase.h"
+#include "git2/refdb.h"
+#include "git2/reflog.h"
+#include "git2/refs.h"
+#include "git2/refspec.h"
+#include "git2/remote.h"
+#include "git2/repository.h"
+#include "git2/reset.h"
+#include "git2/revert.h"
+#include "git2/revparse.h"
+#include "git2/revwalk.h"
+#include "git2/signature.h"
+#include "git2/stash.h"
+#include "git2/status.h"
+#include "git2/submodule.h"
+#include "git2/tag.h"
+#include "git2/transport.h"
+#include "git2/transaction.h"
+#include "git2/tree.h"
+#include "git2/types.h"
+#include "git2/version.h"
+#include "git2/worktree.h"
+
+#endif

include/git2/branch.h

@@ -129,8 +129,8 @@ GIT_EXTERN(void) git_branch_iterator_free(git_branch_iterator *iter);
  * See `git_tag_create()` for rules about valid names.
  *
  * Note that if the move succeeds, the old reference object will not
- + be valid anymore, and should be freed immediately by the user using
- + `git_reference_free()`.
+ * be valid anymore, and should be freed immediately by the user using
+ * `git_reference_free()`.
  *
  * @param out New reference object for the updated name.
  *

include/git2/common.h

@@ -105,11 +105,6 @@ GIT_BEGIN_DECL
  */
 #define GIT_PATH_MAX 4096
 
-/**
- * The string representation of the null object ID.
- */
-#define GIT_OID_HEX_ZERO "0000000000000000000000000000000000000000"
-
 /**
  * Return the version of the libgit2 library
  * being currently used.
@@ -121,6 +116,17 @@ GIT_BEGIN_DECL
  */
 GIT_EXTERN(int) git_libgit2_version(int *major, int *minor, int *rev);
 
+/**
+ * Return the prerelease state of the libgit2 library currently being
+ * used.  For nightly builds during active development, this will be
+ * "alpha".  Releases may have a "beta" or release candidate ("rc1",
+ * "rc2", etc) prerelease.  For a final release, this function returns
+ * NULL.
+ *
+ * @return the name of the prerelease state or NULL
+ */
+GIT_EXTERN(const char *) git_libgit2_prerelease(void);
+
 /**
  * Combinations of these values describe the features with which libgit2
  * was compiled
@@ -214,7 +220,15 @@ typedef enum {
 	GIT_OPT_SET_ODB_PACKED_PRIORITY,
 	GIT_OPT_SET_ODB_LOOSE_PRIORITY,
 	GIT_OPT_GET_EXTENSIONS,
-	GIT_OPT_SET_EXTENSIONS
+	GIT_OPT_SET_EXTENSIONS,
+	GIT_OPT_GET_OWNER_VALIDATION,
+	GIT_OPT_SET_OWNER_VALIDATION,
+	GIT_OPT_GET_HOMEDIR,
+	GIT_OPT_SET_HOMEDIR,
+	GIT_OPT_SET_SERVER_CONNECT_TIMEOUT,
+	GIT_OPT_GET_SERVER_CONNECT_TIMEOUT,
+	GIT_OPT_SET_SERVER_TIMEOUT,
+	GIT_OPT_GET_SERVER_TIMEOUT
 } git_libgit2_opt_t;
 
 /**
@@ -452,6 +466,45 @@ typedef enum {
  *      > to support repositories with the `noop` extension but does want
  *      > to support repositories with the `newext` extension.
  *
+ *   opts(GIT_OPT_GET_OWNER_VALIDATION, int *enabled)
+ *      > Gets the owner validation setting for repository
+ *      > directories.
+ *
+ *   opts(GIT_OPT_SET_OWNER_VALIDATION, int enabled)
+ *      > Set that repository directories should be owned by the current
+ *      > user. The default is to validate ownership.
+ *
+ *   opts(GIT_OPT_GET_HOMEDIR, git_buf *out)
+ *      > Gets the current user's home directory, as it will be used
+ *      > for file lookups. The path is written to the `out` buffer.
+ *
+ *   opts(GIT_OPT_SET_HOMEDIR, const char *path)
+ *      > Sets the directory used as the current user's home directory,
+ *      > for file lookups.
+ *      >
+ *      > - `path` directory of home directory.
+ *
+ *   opts(GIT_OPT_GET_SERVER_CONNECT_TIMEOUT, int *timeout)
+ *      > Gets the timeout (in milliseconds) to attempt connections to
+ *      > a remote server.
+ *
+ *   opts(GIT_OPT_SET_SERVER_CONNECT_TIMEOUT, int timeout)
+ *      > Sets the timeout (in milliseconds) to attempt connections to
+ *      > a remote server. This is supported only for HTTP(S) connections
+ *      > and is not supported by SSH. Set to 0 to use the system default.
+ *      > Note that this may not be able to be configured longer than the
+ *      > system default, typically 75 seconds.
+ *
+ *   opts(GIT_OPT_GET_SERVER_TIMEOUT, int *timeout)
+ *      > Gets the timeout (in milliseconds) for reading from and writing
+ *      > to a remote server.
+ *
+ *   opts(GIT_OPT_SET_SERVER_TIMEOUT, int timeout)
+ *      > Sets the timeout (in milliseconds) for reading from and writing
+ *      > to a remote server. This is supported only for HTTP(S)
+ *      > connections and is not supported by SSH. Set to 0 to use the
+ *      > system default.
+ *
  * @param option Option key
  * @param ... value to set the option
  * @return 0 on success, <0 on failure

include/git2/config.h

@@ -122,7 +122,7 @@ typedef struct {
  * global configuration file.
  *
  * This method will not guess the path to the xdg compatible
- * config file (.config/git/config).
+ * config file (`.config/git/config`).
  *
  * @param out Pointer to a user-allocated git_buf in which to store the path
  * @return 0 if a global configuration file has been found. Its path will be stored in `out`.
@@ -149,8 +149,8 @@ GIT_EXTERN(int) git_config_find_xdg(git_buf *out);
 /**
  * Locate the path to the system configuration file
  *
- * If /etc/gitconfig doesn't exist, it will look for
- * %PROGRAMFILES%\Git\etc\gitconfig.
+ * If `/etc/gitconfig` doesn't exist, it will look for
+ * `%PROGRAMFILES%\Git\etc\gitconfig`.
  *
  * @param out Pointer to a user-allocated git_buf in which to store the path
  * @return 0 if a system configuration file has been
@@ -161,7 +161,7 @@ GIT_EXTERN(int) git_config_find_system(git_buf *out);
 /**
  * Locate the path to the configuration file in ProgramData
  *
- * Look for the file in %PROGRAMDATA%\Git\config used by portable git.
+ * Look for the file in `%PROGRAMDATA%\Git\config` used by portable git.
  *
  * @param out Pointer to a user-allocated git_buf in which to store the path
  * @return 0 if a ProgramData configuration file has been
@@ -449,8 +449,8 @@ GIT_EXTERN(int) git_config_multivar_iterator_new(git_config_iterator **out, cons
 /**
  * Return the current entry and advance the iterator
  *
- * The pointers returned by this function are valid until the iterator
- * is freed.
+ * The pointers returned by this function are valid until the next call
+ * to `git_config_next` or until the iterator is freed.
  *
  * @param entry pointer to store the entry
  * @param iter the iterator

include/git2/deprecated.h

@@ -436,6 +436,8 @@ GIT_EXTERN(int) git_diff_format_email_options_init(
 #define GITERR_WORKTREE GIT_ERROR_WORKTREE
 #define GITERR_SHA1 GIT_ERROR_SHA1
 
+#define GIT_ERROR_SHA1 GIT_ERROR_SHA
+
 /**
  * Return the last `git_error` object that was generated for the
  * current thread.  This is an alias of `git_error_last` and is
@@ -775,6 +777,12 @@ typedef git_trace_cb git_trace_callback;
  */
 /**@{*/
 
+#ifndef GIT_EXPERIMENTAL_SHA256
+# define GIT_OID_RAWSZ    GIT_OID_SHA1_SIZE
+# define GIT_OID_HEXSZ    GIT_OID_SHA1_HEXSIZE
+# define GIT_OID_HEX_ZERO GIT_OID_SHA1_HEXZERO
+#endif
+
 GIT_EXTERN(int) git_oid_iszero(const git_oid *id);
 
 /**@}*/