rugged 0.27.7 → 0.27.9

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

@@ -21,23 +21,6 @@
  */
 GIT_BEGIN_DECL
 
-/**
- * Parse a given refspec string
- *
- * @param refspec a pointer to hold the refspec handle
- * @param input the refspec string
- * @param is_fetch is this a refspec for a fetch
- * @return 0 if the refspec string could be parsed, -1 otherwise
- */
-GIT_EXTERN(int) git_refspec_parse(git_refspec **refspec, const char *input, int is_fetch);
-
-/**
- * Free a refspec object which has been created by git_refspec_parse
- *
- * @param refspec the refspec object
- */
-GIT_EXTERN(void) git_refspec_free(git_refspec *refspec);
-
 /**
  * Get the source specifier
  *

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

@@ -432,8 +432,8 @@ struct git_remote_callbacks {
 	/**
 	 * If cert verification fails, this will be called to let the
 	 * user make the final decision of whether to allow the
-	 * connection to proceed. Returns 0 to allow the connection
-	 * or a negative value to indicate an error.
+	 * connection to proceed. Returns 1 to allow the connection, 0
+	 * to disallow it or a negative value to indicate an error.
 	 */
 	git_transport_certificate_check_cb certificate_check;
 
@@ -596,13 +596,12 @@ typedef struct {
 				 GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED, GIT_PROXY_OPTIONS_INIT }
 
 /**
- * Initialize git_fetch_options structure
- *
  * Initializes a `git_fetch_options` with default values. Equivalent to
- * creating an instance with `GIT_FETCH_OPTIONS_INIT`.
+ * creating an instance with GIT_FETCH_OPTIONS_INIT.
  *
- * @param opts The `git_fetch_options` struct to initialize.
- * @param version The struct version; pass `GIT_FETCH_OPTIONS_VERSION`.
+ * @param opts the `git_fetch_options` instance to initialize.
+ * @param version the version of the struct; you should pass
+ *        `GIT_FETCH_OPTIONS_VERSION` here.
  * @return Zero on success; -1 on failure.
  */
 GIT_EXTERN(int) git_fetch_init_options(
@@ -646,13 +645,12 @@ typedef struct {
 #define GIT_PUSH_OPTIONS_INIT { GIT_PUSH_OPTIONS_VERSION, 0, GIT_REMOTE_CALLBACKS_INIT, GIT_PROXY_OPTIONS_INIT }
 
 /**
- * Initialize git_push_options structure
- *
  * Initializes a `git_push_options` with default values. Equivalent to
- * creating an instance with `GIT_PUSH_OPTIONS_INIT`.
+ * creating an instance with GIT_PUSH_OPTIONS_INIT.
  *
- * @param opts The `git_push_options` struct to initialize.
- * @param version The struct version; pass `GIT_PUSH_OPTIONS_VERSION`.
+ * @param opts the `git_push_options` instance to initialize.
+ * @param version the version of the struct; you should pass
+ *        `GIT_PUSH_OPTIONS_VERSION` here.
  * @return Zero on success; -1 on failure.
  */
 GIT_EXTERN(int) git_push_init_options(

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

@@ -301,13 +301,11 @@ typedef struct {
 #define GIT_REPOSITORY_INIT_OPTIONS_INIT {GIT_REPOSITORY_INIT_OPTIONS_VERSION}
 
 /**
- * Initialize git_repository_init_options structure
+ * Initializes a `git_repository_init_options` with default values. Equivalent
+ * to creating an instance with GIT_REPOSITORY_INIT_OPTIONS_INIT.
  *
- * Initializes a `git_repository_init_options` with default values. Equivalent to
- * creating an instance with `GIT_REPOSITORY_INIT_OPTIONS_INIT`.
- *
- * @param opts The `git_repository_init_options` struct to initialize.
- * @param version The struct version; pass `GIT_REPOSITORY_INIT_OPTIONS_VERSION`.
+ * @param opts the `git_repository_init_options` struct to initialize
+ * @param version Version of struct; pass `GIT_REPOSITORY_INIT_OPTIONS_VERSION`
  * @return Zero on success; -1 on failure.
  */
 GIT_EXTERN(int) git_repository_init_init_options(
@@ -370,7 +368,7 @@ GIT_EXTERN(int) git_repository_head_for_worktree(git_reference **out, git_reposi
  */
 GIT_EXTERN(int) git_repository_head_detached(git_repository *repo);
 
-/**
+/*
  * Check if a worktree's HEAD is detached
  *
  * A worktree's HEAD is detached when it points directly to a

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

@@ -37,13 +37,11 @@ typedef struct {
 #define GIT_REVERT_OPTIONS_INIT {GIT_REVERT_OPTIONS_VERSION, 0, GIT_MERGE_OPTIONS_INIT, GIT_CHECKOUT_OPTIONS_INIT}
 
 /**
- * Initialize git_revert_options structure
- *
  * Initializes a `git_revert_options` with default values. Equivalent to
- * creating an instance with `GIT_REVERT_OPTIONS_INIT`.
+ * creating an instance with GIT_REVERT_OPTIONS_INIT.
  *
- * @param opts The `git_revert_options` struct to initialize.
- * @param version The struct version; pass `GIT_REVERT_OPTIONS_VERSION`.
+ * @param opts the `git_revert_options` struct to initialize
+ * @param version Version of struct; pass `GIT_REVERT_OPTIONS_VERSION`
  * @return Zero on success; -1 on failure.
  */
 GIT_EXTERN(int) git_revert_init_options(

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

@@ -9,7 +9,6 @@
 
 #include "common.h"
 #include "types.h"
-#include "checkout.h"
 
 /**
  * @file git2/stash.h
@@ -81,7 +80,6 @@ typedef enum {
 	GIT_STASH_APPLY_REINSTATE_INDEX = (1 << 0),
 } git_stash_apply_flags;
 
-/** Stash apply progression states */
 typedef enum {
 	GIT_STASH_APPLY_PROGRESS_NONE = 0,
 
@@ -116,12 +114,12 @@ typedef int (*git_stash_apply_progress_cb)(
 	git_stash_apply_progress_t progress,
 	void *payload);
 
-/**
- * Stash application options structure
+/** Stash application options structure.
  *
- * Initialize with `GIT_STASH_APPLY_OPTIONS_INIT`. Alternatively, you can
- * use `git_stash_apply_init_options`.
+ * Initialize with the `GIT_STASH_APPLY_OPTIONS_INIT` macro to set
+ * sensible defaults; for example:
  *
+ *		git_stash_apply_options opts = GIT_STASH_APPLY_OPTIONS_INIT;
  */
 typedef struct git_stash_apply_options {
 	unsigned int version;
@@ -144,13 +142,12 @@ typedef struct git_stash_apply_options {
 	GIT_CHECKOUT_OPTIONS_INIT }
 
 /**
- * Initialize git_stash_apply_options structure
- *
  * Initializes a `git_stash_apply_options` with default values. Equivalent to
- * creating an instance with `GIT_STASH_APPLY_OPTIONS_INIT`.
+ * creating an instance with GIT_STASH_APPLY_OPTIONS_INIT.
  *
- * @param opts The `git_stash_apply_options` struct to initialize.
- * @param version The struct version; pass `GIT_STASH_APPLY_OPTIONS_VERSION`.
+ * @param opts the `git_stash_apply_options` instance to initialize.
+ * @param version the version of the struct; you should pass
+ *        `GIT_STASH_APPLY_OPTIONS_INIT` here.
  * @return Zero on success; -1 on failure.
  */
 GIT_EXTERN(int) git_stash_apply_init_options(

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

@@ -9,8 +9,6 @@
 
 #include "common.h"
 #include "types.h"
-#include "strarray.h"
-#include "diff.h"
 
 /**
  * @file git2/status.h
@@ -191,13 +189,11 @@ typedef struct {
 #define GIT_STATUS_OPTIONS_INIT {GIT_STATUS_OPTIONS_VERSION}
 
 /**
- * Initialize git_status_options structure
- *
  * Initializes a `git_status_options` with default values. Equivalent to
- * creating an instance with `GIT_STATUS_OPTIONS_INIT`.
+ * creating an instance with GIT_STATUS_OPTIONS_INIT.
  *
- * @param opts The `git_status_options` struct to initialize.
- * @param version The struct version; pass `GIT_STATUS_OPTIONS_VERSION`.
+ * @param opts The `git_status_options` instance to initialize.
+ * @param version Version of struct; pass `GIT_STATUS_OPTIONS_VERSION`
  * @return Zero on success; -1 on failure.
  */
 GIT_EXTERN(int) git_status_init_options(

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

@@ -121,9 +121,10 @@ typedef int (*git_submodule_cb)(
 /**
  * Submodule update options structure
  *
- * Initialize with `GIT_SUBMODULE_UPDATE_OPTIONS_INIT`. Alternatively, you can
- * use `git_submodule_update_init_options`.
+ * Use the GIT_SUBMODULE_UPDATE_OPTIONS_INIT to get the default settings,
+ * like this:
  *
+ * git_submodule_update_options opts = GIT_SUBMODULE_UPDATE_OPTIONS_INIT;
  */
 typedef struct git_submodule_update_options {
 	unsigned int version;
@@ -159,13 +160,11 @@ typedef struct git_submodule_update_options {
 	GIT_FETCH_OPTIONS_INIT, 1 }
 
 /**
- * Initialize git_submodule_update_options structure
+ * Initializes a `git_submodule_update_options` with default values.
+ * Equivalent to creating an instance with GIT_SUBMODULE_UPDATE_OPTIONS_INIT.
  *
- * Initializes a `git_submodule_update_options` with default values. Equivalent to
- * creating an instance with `GIT_SUBMODULE_UPDATE_OPTIONS_INIT`.
- *
- * @param opts The `git_submodule_update_options` struct to initialize.
- * @param version The struct version; pass `GIT_SUBMODULE_UPDATE_OPTIONS_VERSION`.
+ * @param opts The `git_submodule_update_options` instance to initialize.
+ * @param version Version of struct; pass `GIT_SUBMODULE_UPDATE_OPTIONS_VERSION`
  * @return Zero on success; -1 on failure.
  */
 GIT_EXTERN(int) git_submodule_update_init_options(

data/vendor/libgit2/include/git2/sys/index.h

@@ -7,9 +7,6 @@
 #ifndef INCLUDE_sys_git_index_h__
 #define INCLUDE_sys_git_index_h__
 
-#include "git2/common.h"
-#include "git2/types.h"
-
 /**
  * @file git2/sys/index.h
  * @brief Low-level Git index manipulation routines

data/vendor/libgit2/include/git2/sys/mempack.h

@@ -23,61 +23,61 @@
 GIT_BEGIN_DECL
 
 /**
- * Instantiate a new mempack backend.
+ *	Instantiate a new mempack backend.
  *
- * The backend must be added to an existing ODB with the highest
- * priority.
+ *	The backend must be added to an existing ODB with the highest
+ *	priority.
  *
- *     git_mempack_new(&mempacker);
- *     git_repository_odb(&odb, repository);
- *     git_odb_add_backend(odb, mempacker, 999);
+ *		git_mempack_new(&mempacker);
+ *		git_repository_odb(&odb, repository);
+ *		git_odb_add_backend(odb, mempacker, 999);
  *
- * Once the backend has been loaded, all writes to the ODB will
- * instead be queued in memory, and can be finalized with
- * `git_mempack_dump`.
+ *	Once the backend has been loaded, all writes to the ODB will
+ *	instead be queued in memory, and can be finalized with
+ *	`git_mempack_dump`.
  *
- * Subsequent reads will also be served from the in-memory store
- * to ensure consistency, until the memory store is dumped.
+ *	Subsequent reads will also be served from the in-memory store
+ *	to ensure consistency, until the memory store is dumped.
  *
- * @param out Pointer where to store the ODB backend
- * @return 0 on success; error code otherwise
+ *	@param out Pointer where to store the ODB backend
+ *	@return 0 on success; error code otherwise
  */
 GIT_EXTERN(int) git_mempack_new(git_odb_backend **out);
 
 /**
- * Dump all the queued in-memory writes to a packfile.
+ *	Dump all the queued in-memory writes to a packfile.
  *
- * The contents of the packfile will be stored in the given buffer.
- * It is the caller's responsibility to ensure that the generated
- * packfile is available to the repository (e.g. by writing it
- * to disk, or doing something crazy like distributing it across
- * several copies of the repository over a network).
+ *	The contents of the packfile will be stored in the given buffer.
+ *	It is the caller's responsibility to ensure that the generated
+ *	packfile is available to the repository (e.g. by writing it
+ *	to disk, or doing something crazy like distributing it across
+ *	several copies of the repository over a network).
  *
- * Once the generated packfile is available to the repository,
- * call `git_mempack_reset` to cleanup the memory store.
+ *	Once the generated packfile is available to the repository,
+ *	call `git_mempack_reset` to cleanup the memory store.
  *
- * Calling `git_mempack_reset` before the packfile has been
- * written to disk will result in an inconsistent repository
- * (the objects in the memory store won't be accessible).
+ *	Calling `git_mempack_reset` before the packfile has been
+ *	written to disk will result in an inconsistent repository
+ *	(the objects in the memory store won't be accessible).
  *
- * @param pack Buffer where to store the raw packfile
- * @param repo The active repository where the backend is loaded
- * @param backend The mempack backend
- * @return 0 on success; error code otherwise
+ *	@param pack Buffer where to store the raw packfile
+ *	@param repo The active repository where the backend is loaded
+ *	@param backend The mempack backend
+ *	@return 0 on success; error code otherwise
  */
 GIT_EXTERN(int) git_mempack_dump(git_buf *pack, git_repository *repo, git_odb_backend *backend);
 
 /**
- * Reset the memory packer by clearing all the queued objects.
+ *	Reset the memory packer by clearing all the queued objects.
  *
- * This assumes that `git_mempack_dump` has been called before to
- * store all the queued objects into a single packfile.
+ *	This assumes that `git_mempack_dump` has been called before to
+ *	store all the queued objects into a single packfile.
  *
- * Alternatively, call `reset` without a previous dump to "undo"
- * all the recently written objects, giving transaction-like
- * semantics to the Git repository.
+ *	Alternatively, call `reset` without a previous dump to "undo"
+ *	all the recently written objects, giving transaction-like
+ *	semantics to the Git repository.
  *
- * @param backend The mempack backend
+ *	@param backend The mempack backend
  */
 GIT_EXTERN(void) git_mempack_reset(git_odb_backend *backend);
 

data/vendor/libgit2/include/git2/sys/merge.h

@@ -7,15 +7,10 @@
 #ifndef INCLUDE_sys_git_merge_h__
 #define INCLUDE_sys_git_merge_h__
 
-#include "git2/common.h"
-#include "git2/types.h"
-#include "git2/index.h"
-#include "git2/merge.h"
-
 /**
  * @file git2/sys/merge.h
  * @brief Git merge driver backend and plugin routines
- * @defgroup git_merge Git merge driver APIs
+ * @defgroup git_backend Git custom backend APIs
  * @ingroup Git
  * @{
  */

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

@@ -8,7 +8,6 @@
 #define INCLUDE_git_transaction_h__
 
 #include "common.h"
-#include "types.h"
 
 /**
  * @file git2/transaction.h

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

@@ -63,9 +63,6 @@ typedef int64_t git_time_t;
 
 #endif
 
-#include "buffer.h"
-#include "oid.h"
-
 /** Basic type (loose or packed) of any Git object. */
 typedef enum {
 	GIT_OBJ_ANY = -2,		/**< Object can be any of the following */
@@ -184,6 +181,9 @@ typedef struct git_transaction git_transaction;
 /** Annotated commits, the input to merge and rebase. */
 typedef struct git_annotated_commit git_annotated_commit;
 
+/** Merge result */
+typedef struct git_merge_result git_merge_result;
+
 /** Representation of a status collection */
 typedef struct git_status_list git_status_list;
 
@@ -215,7 +215,7 @@ typedef enum {
 	GIT_FILEMODE_COMMIT              = 0160000,
 } git_filemode_t;
 
-/**
+/*
  * A refspec specifies the mapping between remote and local reference
  * names when fetch or pushing.
  */
@@ -425,18 +425,15 @@ typedef enum {
 	GIT_SUBMODULE_RECURSE_ONDEMAND = 2,
 } git_submodule_recurse_t;
 
+/** A type to write in a streaming fashion, for example, for filters. */
 typedef struct git_writestream git_writestream;
 
-/** A type to write in a streaming fashion, for example, for filters. */
 struct git_writestream {
 	int (*write)(git_writestream *stream, const char *buffer, size_t len);
 	int (*close)(git_writestream *stream);
 	void (*free)(git_writestream *stream);
 };
 
-/** Representation of .mailmap file state. */
-typedef struct git_mailmap git_mailmap;
-
 /** @} */
 GIT_END_DECL
 

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

@@ -7,10 +7,10 @@
 #ifndef INCLUDE_git_version_h__
 #define INCLUDE_git_version_h__
 
-#define LIBGIT2_VERSION "0.27.0"
+#define LIBGIT2_VERSION "0.27.9"
 #define LIBGIT2_VER_MAJOR 0
 #define LIBGIT2_VER_MINOR 27
-#define LIBGIT2_VER_REVISION 0
+#define LIBGIT2_VER_REVISION 9
 #define LIBGIT2_VER_PATCH 0
 
 #define LIBGIT2_SOVERSION 27

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

@@ -74,31 +74,22 @@ GIT_EXTERN(void) git_worktree_free(git_worktree *wt);
  */
 GIT_EXTERN(int) git_worktree_validate(const git_worktree *wt);
 
-/**
- * Worktree add options structure
- *
- * Initialize with `GIT_WORKTREE_ADD_OPTIONS_INIT`. Alternatively, you can
- * use `git_worktree_add_init_options`.
- *
- */
 typedef struct git_worktree_add_options {
 	unsigned int version;
 
 	int lock; /**< lock newly created worktree */
-	git_reference *ref; /**< reference to use for the new worktree HEAD */
 } git_worktree_add_options;
 
 #define GIT_WORKTREE_ADD_OPTIONS_VERSION 1
-#define GIT_WORKTREE_ADD_OPTIONS_INIT {GIT_WORKTREE_ADD_OPTIONS_VERSION,0,NULL}
+#define GIT_WORKTREE_ADD_OPTIONS_INIT {GIT_WORKTREE_ADD_OPTIONS_VERSION,0}
 
 /**
- * Initialize git_worktree_add_options structure
- *
- * Initializes a `git_worktree_add_options` with default values. Equivalent to
- * creating an instance with `GIT_WORKTREE_ADD_OPTIONS_INIT`.
+ * Initializes a `git_worktree_add_options` with default vaules.
+ * Equivalent to creating an instance with
+ * GIT_WORKTREE_ADD_OPTIONS_INIT.
  *
- * @param opts The `git_worktree_add_options` struct to initialize.
- * @param version The struct version; pass `GIT_WORKTREE_ADD_OPTIONS_VERSION`.
+ * @param opts the struct to initialize
+ * @param version Verison of struct; pass `GIT_WORKTREE_ADD_OPTIONS_VERSION`
  * @return Zero on success; -1 on failure.
  */
 int git_worktree_add_init_options(git_worktree_add_options *opts,
@@ -157,24 +148,6 @@ GIT_EXTERN(int) git_worktree_unlock(git_worktree *wt);
  */
 GIT_EXTERN(int) git_worktree_is_locked(git_buf *reason, const git_worktree *wt);
 
-/**
- * Retrieve the name of the worktree
- *
- * @param wt Worktree to get the name for
- * @return The worktree's name. The pointer returned is valid for the
- *  lifetime of the git_worktree
- */
-GIT_EXTERN(const char *) git_worktree_name(const git_worktree *wt);
-
-/**
- * Retrieve the filesystem path for the worktree
- *
- * @param wt Worktree to get the path for
- * @return The worktree's filesystem path. The pointer returned
- *  is valid for the lifetime of the git_worktree.
- */
-GIT_EXTERN(const char *) git_worktree_path(const git_worktree *wt);
- 
 /**
  * Flags which can be passed to git_worktree_prune to alter its
  * behavior.
@@ -188,13 +161,6 @@ typedef enum {
 	GIT_WORKTREE_PRUNE_WORKING_TREE = 1u << 2,
 } git_worktree_prune_t;
 
-/**
- * Worktree prune options structure
- *
- * Initialize with `GIT_WORKTREE_PRUNE_OPTIONS_INIT`. Alternatively, you can
- * use `git_worktree_prune_init_options`.
- *
- */
 typedef struct git_worktree_prune_options {
 	unsigned int version;
 
@@ -205,13 +171,12 @@ typedef struct git_worktree_prune_options {
 #define GIT_WORKTREE_PRUNE_OPTIONS_INIT {GIT_WORKTREE_PRUNE_OPTIONS_VERSION,0}
 
 /**
- * Initialize git_worktree_prune_options structure
- *
- * Initializes a `git_worktree_prune_options` with default values. Equivalent to
- * creating an instance with `GIT_WORKTREE_PRUNE_OPTIONS_INIT`.
+ * Initializes a `git_worktree_prune_options` with default vaules.
+ * Equivalent to creating an instance with
+ * GIT_WORKTREE_PRUNE_OPTIONS_INIT.
  *
- * @param opts The `git_worktree_prune_options` struct to initialize.
- * @param version The struct version; pass `GIT_WORKTREE_PRUNE_OPTIONS_VERSION`.
+ * @param opts the struct to initialize
+ * @param version Verison of struct; pass `GIT_WORKTREE_PRUNE_OPTIONS_VERSION`
  * @return Zero on success; -1 on failure.
  */
 GIT_EXTERN(int) git_worktree_prune_init_options(