rugged 1.7.2 → 1.9.0

data/vendor/libgit2/include/git2/blob.h

@@ -15,9 +15,13 @@
 
 /**
  * @file git2/blob.h
- * @brief Git blob load and write routines
+ * @brief A blob represents a file in a git repository.
  * @defgroup git_blob Git blob load and write routines
  * @ingroup Git
+ *
+ * A blob represents a file in a git repository. This is the raw data
+ * as it is stored in the repository itself. Blobs may be "filtered"
+ * to produce the on-disk content.
  * @{
  */
 GIT_BEGIN_DECL
@@ -25,12 +29,15 @@ GIT_BEGIN_DECL
 /**
  * Lookup a blob object from a repository.
  *
- * @param blob pointer to the looked up blob
+ * @param[out] blob pointer to the looked up blob
  * @param repo the repo to use when locating the blob.
  * @param id identity of the blob to locate.
  * @return 0 or an error code
  */
-GIT_EXTERN(int) git_blob_lookup(git_blob **blob, git_repository *repo, const git_oid *id);
+GIT_EXTERN(int) git_blob_lookup(
+	git_blob **blob,
+	git_repository *repo,
+	const git_oid *id);
 
 /**
  * Lookup a blob object from a repository,
@@ -38,7 +45,7 @@ GIT_EXTERN(int) git_blob_lookup(git_blob **blob, git_repository *repo, const git
  *
  * @see git_object_lookup_prefix
  *
- * @param blob pointer to the looked up blob
+ * @param[out] blob pointer to the looked up blob
  * @param repo the repo to use when locating the blob.
  * @param id identity of the blob to locate.
  * @param len the length of the short identifier
@@ -84,7 +91,7 @@ GIT_EXTERN(git_repository *) git_blob_owner(const git_blob *blob);
  * time.
  *
  * @param blob pointer to the blob
- * @return the pointer, or NULL on error
+ * @return @type `unsigned char *` the pointer, or NULL on error
  */
 GIT_EXTERN(const void *) git_blob_rawcontent(const git_blob *blob);
 
@@ -92,12 +99,14 @@ GIT_EXTERN(const void *) git_blob_rawcontent(const git_blob *blob);
  * Get the size in bytes of the contents of a blob
  *
  * @param blob pointer to the blob
- * @return size on bytes
+ * @return size in bytes
  */
 GIT_EXTERN(git_object_size_t) git_blob_rawsize(const git_blob *blob);
 
 /**
  * Flags to control the functionality of `git_blob_filter`.
+ *
+ * @flags
  */
 typedef enum {
 	/** When set, filters will not be applied to binary files. */
@@ -128,16 +137,34 @@ typedef enum {
  * Initialize with `GIT_BLOB_FILTER_OPTIONS_INIT`. Alternatively, you can
  * use `git_blob_filter_options_init`.
  *
+ * @options[version] GIT_BLOB_FILTER_OPTIONS_VERSION
+ * @options[init_macro] GIT_BLOB_FILTER_OPTIONS_INIT
+ * @options[init_function] git_blob_filter_options_init
  */
 typedef struct {
+	/** Version number of the options structure. */
 	int version;
 
-	/** Flags to control the filtering process, see `git_blob_filter_flag_t` above */
+	/**
+	 * Flags to control the filtering process, see `git_blob_filter_flag_t` above.
+	 *
+	 * @type[flags] git_blob_filter_flag_t
+	 */
 	uint32_t flags;
 
 #ifdef GIT_DEPRECATE_HARD
+	/**
+	 * Unused and reserved for ABI compatibility.
+	 *
+	 * @deprecated this value should not be set
+	 */
 	void *reserved;
 #else
+	/**
+	 * This value is unused and reserved for API compatibility.
+	 *
+	 * @deprecated this value should not be set
+	 */
 	git_oid *commit_id;
 #endif
 
@@ -148,8 +175,18 @@ typedef struct {
 	git_oid attr_commit_id;
 } git_blob_filter_options;
 
+/**
+ * The current version number for the `git_blob_filter_options` structure ABI.
+ */
 #define GIT_BLOB_FILTER_OPTIONS_VERSION 1
-#define GIT_BLOB_FILTER_OPTIONS_INIT {GIT_BLOB_FILTER_OPTIONS_VERSION, GIT_BLOB_FILTER_CHECK_FOR_BINARY}
+
+/**
+ * The default values for `git_blob_filter_options`.
+ */
+#define GIT_BLOB_FILTER_OPTIONS_INIT { \
+		GIT_BLOB_FILTER_OPTIONS_VERSION, \
+		GIT_BLOB_FILTER_CHECK_FOR_BINARY \
+	}
 
 /**
  * Initialize git_blob_filter_options structure
@@ -158,10 +195,12 @@ typedef struct {
  * to creating an instance with `GIT_BLOB_FILTER_OPTIONS_INIT`.
  *
  * @param opts The `git_blob_filter_options` struct to initialize.
- * @param version The struct version; pass `GIT_BLOB_FILTER_OPTIONS_VERSION`.
+ * @param version The struct version; pass GIT_BLOB_FILTER_OPTIONS_VERSION
  * @return Zero on success; -1 on failure.
  */
-GIT_EXTERN(int) git_blob_filter_options_init(git_blob_filter_options *opts, unsigned int version);
+GIT_EXTERN(int) git_blob_filter_options_init(
+	git_blob_filter_options *opts,
+	unsigned int version);
 
 /**
  * Get a buffer with the filtered content of a blob.
@@ -171,7 +210,7 @@ GIT_EXTERN(int) git_blob_filter_options_init(git_blob_filter_options *opts, unsi
  * CRLF filtering or other types of changes depending on the file
  * attributes set for the blob and the content detected in it.
  *
- * The output is written into a `git_buf` which the caller must free
+ * The output is written into a `git_buf` which the caller must dispose
  * when done (via `git_buf_dispose`).
  *
  * If no filters need to be applied, then the `out` buffer will just
@@ -183,7 +222,7 @@ GIT_EXTERN(int) git_blob_filter_options_init(git_blob_filter_options *opts, unsi
  * @param blob Pointer to the blob
  * @param as_path Path used for file attribute lookups, etc.
  * @param opts Options to use for filtering the blob
- * @return 0 on success or an error code
+ * @return @type[enum] git_error_code 0 on success or an error code
  */
 GIT_EXTERN(int) git_blob_filter(
 	git_buf *out,
@@ -192,10 +231,10 @@ GIT_EXTERN(int) git_blob_filter(
 	git_blob_filter_options *opts);
 
 /**
- * Read a file from the working folder of a repository
- * and write it to the Object Database as a loose blob
+ * Read a file from the working folder of a repository and write it
+ * to the object database.
  *
- * @param id return the id of the written blob
+ * @param[out] id return the id of the written blob
  * @param repo repository where the blob will be written.
  *	this repository cannot be bare
  * @param relative_path file from which the blob will be created,
@@ -205,19 +244,23 @@ GIT_EXTERN(int) git_blob_filter(
 GIT_EXTERN(int) git_blob_create_from_workdir(git_oid *id, git_repository *repo, const char *relative_path);
 
 /**
- * Read a file from the filesystem and write its content
- * to the Object Database as a loose blob
+ * Read a file from the filesystem (not necessarily inside the
+ * working folder of the repository) and write it to the object
+ * database.
  *
- * @param id return the id of the written blob
+ * @param[out] id return the id of the written blob
  * @param repo repository where the blob will be written.
  *	this repository can be bare or not
  * @param path file from which the blob will be created
  * @return 0 or an error code
  */
-GIT_EXTERN(int) git_blob_create_from_disk(git_oid *id, git_repository *repo, const char *path);
+GIT_EXTERN(int) git_blob_create_from_disk(
+	git_oid *id,
+	git_repository *repo,
+	const char *path);
 
 /**
- * Create a stream to write a new blob into the object db
+ * Create a stream to write a new blob into the object database.
  *
  * This function may need to buffer the data on disk and will in
  * general not be the right choice if you know the size of the data
@@ -234,7 +277,7 @@ GIT_EXTERN(int) git_blob_create_from_disk(git_oid *id, git_repository *repo, con
  * what git filters should be applied to the object before it is written
  * to the object database.
  *
- * @param out the stream into which to write
+ * @param[out] out the stream into which to write
  * @param repo Repository where the blob will be written.
  *        This repository can be bare or not.
  * @param hintpath If not NULL, will be used to select data filters
@@ -247,11 +290,11 @@ GIT_EXTERN(int) git_blob_create_from_stream(
 	const char *hintpath);
 
 /**
- * Close the stream and write the blob to the object db
+ * Close the stream and finalize writing the blob to the object database.
  *
  * The stream will be closed and freed.
  *
- * @param out the id of the new blob
+ * @param[out] out the id of the new blob
  * @param stream the stream to close
  * @return 0 or an error code
  */
@@ -260,9 +303,9 @@ GIT_EXTERN(int) git_blob_create_from_stream_commit(
 	git_writestream *stream);
 
 /**
- * Write an in-memory buffer to the ODB as a blob
+ * Write an in-memory buffer to the object database as a blob.
  *
- * @param id return the id of the written blob
+ * @param[out] id return the id of the written blob
  * @param repo repository where the blob will be written
  * @param buffer data to be written into the blob
  * @param len length of the data
@@ -272,14 +315,14 @@ GIT_EXTERN(int) git_blob_create_from_buffer(
 	git_oid *id, git_repository *repo, const void *buffer, size_t len);
 
 /**
- * Determine if the blob content is most certainly binary or not.
+ * Determine if the blob content is most likely binary or not.
  *
  * The heuristic used to guess if a file is binary is taken from core git:
  * Searching for NUL bytes and looking for a reasonable ratio of printable
  * to non-printable characters among the first 8000 bytes.
  *
  * @param blob The blob which content should be analyzed
- * @return 1 if the content of the blob is detected
+ * @return @type bool 1 if the content of the blob is detected
  * as binary; 0 otherwise.
  */
 GIT_EXTERN(int) git_blob_is_binary(const git_blob *blob);
@@ -300,7 +343,7 @@ GIT_EXTERN(int) git_blob_data_is_binary(const char *data, size_t len);
  * Create an in-memory copy of a blob. The copy must be explicitly
  * free'd or it will leak.
  *
- * @param out Pointer to store the copy of the object
+ * @param[out] out Pointer to store the copy of the object
  * @param source Original object to copy
  * @return 0.
  */

data/vendor/libgit2/include/git2/branch.h

@@ -13,9 +13,15 @@
 
 /**
  * @file git2/branch.h
- * @brief Git branch parsing routines
+ * @brief Branch creation and handling
  * @defgroup git_branch Git branch management
  * @ingroup Git
+ *
+ * A branch is a specific type of reference, at any particular time,
+ * a git working directory typically is said to have a branch "checked out",
+ * meaning that commits that are created will be made "on" a branch.
+ * This occurs by updating the branch reference to point to the new
+ * commit. The checked out branch is indicated by the `HEAD` meta-ref.
  * @{
  */
 GIT_BEGIN_DECL
@@ -33,18 +39,13 @@ GIT_BEGIN_DECL
  * See `git_tag_create()` for rules about valid names.
  *
  * @param out Pointer where to store the underlying reference.
- *
  * @param repo the repository to create the branch in.
- *
  * @param branch_name Name for the branch; this name is
- * validated for consistency. It should also not conflict with
- * an already existing branch name.
- *
+ *   validated for consistency. It should also not conflict with
+ *   an already existing branch name.
  * @param target Commit to which this branch should point. This object
- * must belong to the given `repo`.
- *
+ *   must belong to the given `repo`.
  * @param force Overwrite existing branch.
- *
  * @return 0, GIT_EINVALIDSPEC or an error code.
  * A proper reference is written in the refs/heads namespace
  * pointing to the provided target commit.
@@ -63,15 +64,21 @@ GIT_EXTERN(int) git_branch_create(
  * commit, which lets you specify which extended sha syntax string was
  * specified by a user, allowing for more exact reflog messages.
  *
- * See the documentation for `git_branch_create()`.
- *
- * @see git_branch_create
+ * @param ref_out Pointer where to store the underlying reference.
+ * @param repo the repository to create the branch in.
+ * @param branch_name Name for the branch; this name is
+ *   validated for consistency. It should also not conflict with
+ *   an already existing branch name.
+ * @param target Annotated commit to which this branch should point. This
+ *   object must belong to the given `repo`.
+ * @param force Overwrite existing branch.
+ * @return 0, GIT_EINVALIDSPEC or an error code.
  */
 GIT_EXTERN(int) git_branch_create_from_annotated(
 	git_reference **ref_out,
-	git_repository *repository,
+	git_repository *repo,
 	const char *branch_name,
-	const git_annotated_commit *commit,
+	const git_annotated_commit *target,
 	int force);
 
 /**
@@ -222,7 +229,7 @@ GIT_EXTERN(int) git_branch_upstream(
  * @param branch the branch to configure
  * @param branch_name remote-tracking or local branch to set as upstream.
  *
- * @return 0 on success; GIT_ENOTFOUND if there's no branch named `branch_name`
+ * @return @type git_error_t 0 on success; GIT_ENOTFOUND if there's no branch named `branch_name`
  *         or an error code
  */
 GIT_EXTERN(int) git_branch_set_upstream(

data/vendor/libgit2/include/git2/buffer.h

@@ -11,9 +11,12 @@
 
 /**
  * @file git2/buffer.h
- * @brief Buffer export structure
- *
+ * @brief A data structure to return data to callers
  * @ingroup Git
+ *
+ * The `git_buf` buffer is used to return arbitrary data - typically
+ * strings - to callers. Callers are responsible for freeing the memory
+ * in a buffer with the `git_buf_dispose` function.
  * @{
  */
 GIT_BEGIN_DECL
@@ -67,8 +70,7 @@ typedef struct {
  */
 GIT_EXTERN(void) git_buf_dispose(git_buf *buffer);
 
-GIT_END_DECL
-
 /** @} */
+GIT_END_DECL
 
 #endif

data/vendor/libgit2/include/git2/cert.h

@@ -12,7 +12,7 @@
 
 /**
  * @file git2/cert.h
- * @brief Git certificate objects
+ * @brief TLS and SSH certificate handling
  * @defgroup git_cert Certificate objects
  * @ingroup Git
  * @{
@@ -169,4 +169,5 @@ typedef struct {
 
 /** @} */
 GIT_END_DECL
+
 #endif

data/vendor/libgit2/include/git2/checkout.h

@@ -13,9 +13,13 @@
 
 /**
  * @file git2/checkout.h
- * @brief Git checkout routines
+ * @brief Update the contents of the working directory
  * @defgroup git_checkout Git checkout routines
  * @ingroup Git
+ *
+ * Update the contents of the working directory, or a subset of the
+ * files in the working directory, to point to the data in the index
+ * or a specific commit.
  * @{
  */
 GIT_BEGIN_DECL
@@ -31,17 +35,11 @@ GIT_BEGIN_DECL
  * check out, the "baseline" tree of what was checked out previously, the
  * working directory for actual files, and the index for staged changes.
  *
- * You give checkout one of three strategies for update:
- *
- * - `GIT_CHECKOUT_NONE` is a dry-run strategy that checks for conflicts,
- *   etc., but doesn't make any actual changes.
- *
- * - `GIT_CHECKOUT_FORCE` is at the opposite extreme, taking any action to
- *   make the working directory match the target (including potentially
- *   discarding modified files).
+ * You give checkout one of two strategies for update:
  *
- * - `GIT_CHECKOUT_SAFE` is between these two options, it will only make
- *   modifications that will not lose changes.
+ * - `GIT_CHECKOUT_SAFE` is the default, and similar to git's default,
+ *   which will make modifications that will not lose changes in the
+ *   working directory.
  *
  *                         |  target == baseline   |  target != baseline  |
  *    ---------------------|-----------------------|----------------------|
@@ -55,6 +53,10 @@ GIT_BEGIN_DECL
  *      baseline present   |                       |                      |
  *    ---------------------|-----------------------|----------------------|
  *
+ * - `GIT_CHECKOUT_FORCE` will take any action to make the working
+ *   directory match the target (including potentially discarding
+ *   modified files).
+ *
  * To emulate `git checkout`, use `GIT_CHECKOUT_SAFE` with a checkout
  * notification callback (see below) that displays information about dirty
  * files.  The default behavior will cancel checkout on conflicts.
@@ -69,6 +71,9 @@ GIT_BEGIN_DECL
  *
  * There are some additional flags to modify the behavior of checkout:
  *
+ * - `GIT_CHECKOUT_DRY_RUN` is a dry-run strategy that checks for conflicts,
+ *   etc., but doesn't make any actual changes.
+ *
  * - GIT_CHECKOUT_ALLOW_CONFLICTS makes SAFE mode apply safe file updates
  *   even if there are conflicts (instead of cancelling the checkout).
  *
@@ -102,29 +107,24 @@ GIT_BEGIN_DECL
  *   files or folders that fold to the same name on case insensitive
  *   filesystems.  This can cause files to retain their existing names
  *   and write through existing symbolic links.
+ *
+ * @flags
  */
 typedef enum {
-	GIT_CHECKOUT_NONE = 0, /**< default is a dry run, no actual updates */
-
 	/**
 	 * Allow safe updates that cannot overwrite uncommitted data.
-	 * If the uncommitted changes don't conflict with the checked out files,
-	 * the checkout will still proceed, leaving the changes intact.
-	 *
-	 * Mutually exclusive with GIT_CHECKOUT_FORCE.
-	 * GIT_CHECKOUT_FORCE takes precedence over GIT_CHECKOUT_SAFE.
+	 * If the uncommitted changes don't conflict with the checked
+	 * out files, the checkout will still proceed, leaving the
+	 * changes intact.
 	 */
-	GIT_CHECKOUT_SAFE = (1u << 0),
+	GIT_CHECKOUT_SAFE = 0,
 
 	/**
-	 * Allow all updates to force working directory to look like index.
-	 *
-	 * Mutually exclusive with GIT_CHECKOUT_SAFE.
-	 * GIT_CHECKOUT_FORCE takes precedence over GIT_CHECKOUT_SAFE.
+	 * Allow all updates to force working directory to look like
+	 * the index, potentially losing data in the process.
 	 */
 	GIT_CHECKOUT_FORCE = (1u << 1),
 
-
 	/** Allow checkout to recreate missing files */
 	GIT_CHECKOUT_RECREATE_MISSING = (1u << 2),
 
@@ -178,8 +178,9 @@ typedef enum {
 	GIT_CHECKOUT_DONT_WRITE_INDEX = (1u << 23),
 
 	/**
-	 * Show what would be done by a checkout.  Stop after sending
-	 * notifications; don't update the working directory or index.
+	 * Perform a "dry run", reporting what _would_ be done but
+	 * without actually making changes in the working directory
+	 * or the index.
 	 */
 	GIT_CHECKOUT_DRY_RUN = (1u << 24),
 
@@ -187,6 +188,14 @@ typedef enum {
 	GIT_CHECKOUT_CONFLICT_STYLE_ZDIFF3 = (1u << 25),
 
 	/**
+	 * Do not do a checkout and do not fire callbacks; this is primarily
+	 * useful only for internal functions that will perform the
+	 * checkout themselves but need to pass checkout options into
+	 * another function, for example, `git_clone`.
+	*/
+	GIT_CHECKOUT_NONE = (1u << 30),
+
+	/*
 	 * THE FOLLOWING OPTIONS ARE NOT YET IMPLEMENTED
 	 */
 
@@ -194,7 +203,6 @@ typedef enum {
 	GIT_CHECKOUT_UPDATE_SUBMODULES = (1u << 16),
 	/** Recursively checkout submodules if HEAD moved in super repo (NOT IMPLEMENTED) */
 	GIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED = (1u << 17)
-
 } git_checkout_strategy_t;
 
 /**
@@ -210,6 +218,8 @@ typedef enum {
  * Notification callbacks are made prior to modifying any files on disk,
  * so canceling on any notification will still happen prior to any files
  * being modified.
+ *
+ * @flags
  */
 typedef enum {
 	GIT_CHECKOUT_NOTIFY_NONE      = 0,
@@ -251,7 +261,17 @@ typedef struct {
 	size_t chmod_calls;
 } git_checkout_perfdata;
 
-/** Checkout notification callback function */
+/**
+ * Checkout notification callback function.
+ *
+ * @param why the notification reason
+ * @param path the path to the file being checked out
+ * @param baseline the baseline's diff file information
+ * @param target the checkout target diff file information
+ * @param workdir the working directory diff file information
+ * @param payload the user-supplied callback payload
+ * @return 0 on success, or an error code
+ */
 typedef int GIT_CALLBACK(git_checkout_notify_cb)(
 	git_checkout_notify_t why,
 	const char *path,
@@ -260,14 +280,26 @@ typedef int GIT_CALLBACK(git_checkout_notify_cb)(
 	const git_diff_file *workdir,
 	void *payload);
 
-/** Checkout progress notification function */
+/**
+ * Checkout progress notification function.
+ *
+ * @param path the path to the file being checked out
+ * @param completed_steps number of checkout steps completed
+ * @param total_steps number of total steps in the checkout process
+ * @param payload the user-supplied callback payload
+ */
 typedef void GIT_CALLBACK(git_checkout_progress_cb)(
 	const char *path,
 	size_t completed_steps,
 	size_t total_steps,
 	void *payload);
 
-/** Checkout perfdata notification function */
+/**
+ * Checkout performance data reporting function.
+ *
+ * @param perfdata the performance data for the checkout
+ * @param payload the user-supplied callback payload
+ */
 typedef void GIT_CALLBACK(git_checkout_perfdata_cb)(
 	const git_checkout_perfdata *perfdata,
 	void *payload);
@@ -278,10 +310,18 @@ typedef void GIT_CALLBACK(git_checkout_perfdata_cb)(
  * Initialize with `GIT_CHECKOUT_OPTIONS_INIT`. Alternatively, you can
  * use `git_checkout_options_init`.
  *
+ * @options[version] GIT_CHECKOUT_OPTIONS_VERSION
+ * @options[init_macro] GIT_CHECKOUT_OPTIONS_INIT
+ * @options[init_function] git_checkout_options_init
  */
 typedef struct git_checkout_options {
 	unsigned int version; /**< The version */
 
+	/**
+	 * Checkout strategy. Default is a safe checkout.
+	 *
+	 * @type[flags] git_checkout_strategy_t
+	 */
 	unsigned int checkout_strategy; /**< default will be a safe checkout */
 
 	int disable_filters;    /**< don't apply filters like CRLF conversion */
@@ -289,7 +329,13 @@ typedef struct git_checkout_options {
 	unsigned int file_mode; /**< default is 0644 or 0755 as dictated by blob */
 	int file_open_flags;    /**< default is O_CREAT | O_TRUNC | O_WRONLY */
 
-	unsigned int notify_flags; /**< see `git_checkout_notify_t` above */
+	/**
+	 * Checkout notification flags specify what operations the notify
+	 * callback is invoked for.
+	 *
+	 * @type[flags] git_checkout_notify_t
+	 */
+	unsigned int notify_flags;
 
 	/**
 	 * Optional callback to get notifications on specific file states.
@@ -344,8 +390,12 @@ typedef struct git_checkout_options {
 	void *perfdata_payload;
 } git_checkout_options;
 
+
+/** Current version for the `git_checkout_options` structure */
 #define GIT_CHECKOUT_OPTIONS_VERSION 1
-#define GIT_CHECKOUT_OPTIONS_INIT {GIT_CHECKOUT_OPTIONS_VERSION, GIT_CHECKOUT_SAFE}
+
+/** Static constructor for `git_checkout_options` */
+#define GIT_CHECKOUT_OPTIONS_INIT { GIT_CHECKOUT_OPTIONS_VERSION }
 
 /**
  * Initialize git_checkout_options structure
@@ -414,4 +464,5 @@ GIT_EXTERN(int) git_checkout_tree(
 
 /** @} */
 GIT_END_DECL
+
 #endif

data/vendor/libgit2/include/git2/cherrypick.h

@@ -13,9 +13,12 @@
 
 /**
  * @file git2/cherrypick.h
- * @brief Git cherry-pick routines
+ * @brief Cherry-pick the contents of an individual commit
  * @defgroup git_cherrypick Git cherry-pick routines
  * @ingroup Git
+ *
+ * "Cherry-pick" will attempts to re-apply the changes in an
+ * individual commit to the current index and working directory.
  * @{
  */
 GIT_BEGIN_DECL
@@ -33,8 +36,13 @@ typedef struct {
 	git_checkout_options checkout_opts; /**< Options for the checkout */
 } git_cherrypick_options;
 
+/** Current version for the `git_cherrypick_options` structure */
 #define GIT_CHERRYPICK_OPTIONS_VERSION 1
-#define GIT_CHERRYPICK_OPTIONS_INIT {GIT_CHERRYPICK_OPTIONS_VERSION, 0, GIT_MERGE_OPTIONS_INIT, GIT_CHECKOUT_OPTIONS_INIT}
+
+/** Static constructor for `git_cherrypick_options` */
+#define GIT_CHERRYPICK_OPTIONS_INIT { \
+	GIT_CHERRYPICK_OPTIONS_VERSION, 0, \
+	GIT_MERGE_OPTIONS_INIT, GIT_CHECKOUT_OPTIONS_INIT }
 
 /**
  * Initialize git_cherrypick_options structure
@@ -89,4 +97,3 @@ GIT_EXTERN(int) git_cherrypick(
 GIT_END_DECL
 
 #endif
-