rugged 0.27.7 → 0.27.9

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

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

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

@@ -96,9 +96,9 @@ typedef int (*git_repository_create_cb)(
 /**
  * Clone options structure
  *
- * Initialize with `GIT_CLONE_OPTIONS_INIT`. Alternatively, you can
- * use `git_clone_init_options`.
+ * Use the GIT_CLONE_OPTIONS_INIT to get the default settings, like this:
  *
+ *		git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
  */
 typedef struct git_clone_options {
 	unsigned int version;
@@ -169,13 +169,11 @@ typedef struct git_clone_options {
 	GIT_FETCH_OPTIONS_INIT }
 
 /**
- * Initialize git_clone_options structure
+ * Initializes a `git_clone_options` with default values. Equivalent to
+ * creating an instance with GIT_CLONE_OPTIONS_INIT.
  *
- * Initializes a `git_clone_options` with default values. Equivalent to creating
- * an instance with GIT_CLONE_OPTIONS_INIT.
- *
- * @param opts The `git_clone_options` struct to initialize.
- * @param version The struct version; pass `GIT_CLONE_OPTIONS_VERSION`.
+ * @param opts The `git_clone_options` struct to initialize
+ * @param version Version of struct; pass `GIT_CLONE_OPTIONS_VERSION`
  * @return Zero on success; -1 on failure.
  */
 GIT_EXTERN(int) git_clone_init_options(

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

@@ -172,34 +172,6 @@ GIT_EXTERN(const git_signature *) git_commit_committer(const git_commit *commit)
  */
 GIT_EXTERN(const git_signature *) git_commit_author(const git_commit *commit);
 
-/**
- * Get the committer of a commit, using the mailmap to map names and email
- * addresses to canonical real names and email addresses.
- *
- * Call `git_signature_free` to free the signature.
- *
- * @param out a pointer to store the resolved signature.
- * @param commit a previously loaded commit.
- * @param mailmap the mailmap to resolve with. (may be NULL)
- * @return 0 or an error code
- */
-GIT_EXTERN(int) git_commit_committer_with_mailmap(
-	git_signature **out, const git_commit *commit, const git_mailmap *mailmap);
-
-/**
- * Get the author of a commit, using the mailmap to map names and email
- * addresses to canonical real names and email addresses.
- *
- * Call `git_signature_free` to free the signature.
- *
- * @param out a pointer to store the resolved signature.
- * @param commit a previously loaded commit.
- * @param mailmap the mailmap to resolve with. (may be NULL)
- * @return 0 or an error code
- */
-GIT_EXTERN(int) git_commit_author_with_mailmap(
-	git_signature **out, const git_commit *commit, const git_mailmap *mailmap);
-
 /**
  * Get the full raw text of the commit header.
  *

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

@@ -48,17 +48,6 @@ typedef size_t size_t;
 # define GIT_EXTERN(type) extern type
 #endif
 
-/** Declare a function as deprecated. */
-#if defined(__GNUC__)
-# define GIT_DEPRECATED(func) \
-			 __attribute__((deprecated)) \
-			 func
-#elif defined(_MSC_VER)
-# define GIT_DEPRECATED(func) __declspec(deprecated) func
-#else
-# define GIT_DEPRECATED(func) func
-#endif
-
 /** Declare a function's takes printf style arguments. */
 #ifdef __GNUC__
 # define GIT_FORMAT_PRINTF(a,b) __attribute__((format (printf, a, b)))
@@ -194,8 +183,6 @@ typedef enum {
 	GIT_OPT_GET_WINDOWS_SHAREMODE,
 	GIT_OPT_SET_WINDOWS_SHAREMODE,
 	GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION,
-	GIT_OPT_SET_ALLOCATOR,
-	GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY
 } git_libgit2_opt_t;
 
 /**
@@ -358,20 +345,6 @@ typedef enum {
  *		> additional checksum calculation on each object. This defaults
  *		> to enabled.
  *
- *	 opts(GIT_OPT_SET_ALLOCATOR, git_allocator *allocator)
- *
- *		> Set the memory allocator to a different memory allocator. This
- *		> allocator will then be used to make all memory allocations for
- *		> libgit2 operations.
- *
- *	 opts(GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY, int enabled)
- *
- *		> Ensure that there are no unsaved changes in the index before
- *		> beginning any operation that reloads the index from disk (eg,
- *		> checkout).  If there are unsaved changes, the instruction will
- *		> fail.  (Using the FORCE flag to checkout will still overwrite
- *		> these changes.)
- *
  * @param option Option key
  * @param ... value to set the option
  * @return 0 on success, <0 on failure

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

@@ -64,7 +64,6 @@ typedef enum {
 typedef struct git_config_entry {
 	const char *name; /**< Name of the entry (normalised) */
 	const char *value; /**< String value of the entry */
-	unsigned int include_depth; /**< Depth of includes where this variable was found */
 	git_config_level_t level; /**< Which config file this was found in */
 	void (*free)(struct git_config_entry *entry); /**< Free function for this entry */
 	void *payload; /**< Opaque value for the free function. Do not read or write */

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

@@ -36,9 +36,10 @@ typedef enum {
 /**
  * Describe options structure
  *
- * Initialize with `GIT_DESCRIBE_OPTIONS_INIT`. Alternatively, you can
- * use `git_describe_init_options`.
+ * Initialize with `GIT_DESCRIBE_OPTIONS_INIT` macro to correctly set
+ * the `version` field.  E.g.
  *
+ *		git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT;
  */
 typedef struct git_describe_options {
 	unsigned int version;
@@ -69,24 +70,10 @@ typedef struct git_describe_options {
 	GIT_DESCRIBE_DEFAULT_MAX_CANDIDATES_TAGS, \
 }
 
-/**
- * Initialize git_describe_options structure
- *
- * Initializes a `git_describe_options` with default values. Equivalent to creating
- * an instance with GIT_DESCRIBE_OPTIONS_INIT.
- *
- * @param opts The `git_describe_options` struct to initialize.
- * @param version The struct version; pass `GIT_DESCRIBE_OPTIONS_VERSION`.
- * @return Zero on success; -1 on failure.
- */
 GIT_EXTERN(int) git_describe_init_options(git_describe_options *opts, unsigned int version);
 
 /**
- * Describe format options structure
- *
- * Initialize with `GIT_DESCRIBE_FORMAT_OPTIONS_INIT`. Alternatively, you can
- * use `git_describe_format_init_options`.
- *
+ * Options for formatting the describe string
  */
 typedef struct {
 	unsigned int version;
@@ -116,16 +103,6 @@ typedef struct {
 		GIT_DESCRIBE_DEFAULT_ABBREVIATED_SIZE, \
  }
 
-/**
- * Initialize git_describe_format_options structure
- *
- * Initializes a `git_describe_format_options` with default values. Equivalent to creating
- * an instance with GIT_DESCRIBE_FORMAT_OPTIONS_INIT.
- *
- * @param opts The `git_describe_format_options` struct to initialize.
- * @param version The struct version; pass `GIT_DESCRIBE_FORMAT_OPTIONS_VERSION`.
- * @return Zero on success; -1 on failure.
- */
 GIT_EXTERN(int) git_describe_init_format_options(git_describe_format_options *opts, unsigned int version);
 
 /**
@@ -141,7 +118,7 @@ typedef struct git_describe_result git_describe_result;
  * @param result pointer to store the result. You must free this once
  * you're done with it.
  * @param committish a committish to describe
- * @param opts the lookup options (or NULL for defaults)
+ * @param opts the lookup options
  */
 GIT_EXTERN(int) git_describe_commit(
 	git_describe_result **result,
@@ -158,7 +135,7 @@ GIT_EXTERN(int) git_describe_commit(
  * @param out pointer to store the result. You must free this once
  * you're done with it.
  * @param repo the repository in which to perform the describe
- * @param opts the lookup options (or NULL for defaults)
+ * @param opts the lookup options
  */
 GIT_EXTERN(int) git_describe_workdir(
 	git_describe_result **out,
@@ -171,7 +148,7 @@ GIT_EXTERN(int) git_describe_workdir(
  * @param out The buffer to store the result
  * @param result the result from `git_describe_commit()` or
  * `git_describe_workdir()`.
- * @param opts the formatting options (or NULL for defaults)
+ * @param opts the formatting options
  */
 GIT_EXTERN(int) git_describe_format(
 	git_buf *out,

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

@@ -171,12 +171,6 @@ typedef enum {
 	 * Options controlling how output will be generated
 	 */
 
-	/** Use a heuristic that takes indentation and whitespace into account
-	 * which generally can produce better diffs when dealing with ambiguous
-	 * diff hunks.
-	 */
-	GIT_DIFF_INDENT_HEURISTIC = (1u << 18),
-
 	/** Treat all files as text, disabling binary attributes & detection */
 	GIT_DIFF_FORCE_TEXT = (1u << 20),
 	/** Treat all files as binary, disabling text diffs */
@@ -212,6 +206,12 @@ typedef enum {
 	 *  can apply given diff information to binary files.
 	 */
 	GIT_DIFF_SHOW_BINARY = (1u << 30),
+
+	/** Use a heuristic that takes indentation and whitespace into account
+	 * which generally can produce better diffs when dealing with ambiguous
+	 * diff hunks.
+	 */
+	GIT_DIFF_INDENT_HEURISTIC = (1u << 31),
 } git_diff_option_t;
 
 /**
@@ -437,13 +437,11 @@ typedef struct {
 	{GIT_DIFF_OPTIONS_VERSION, 0, GIT_SUBMODULE_IGNORE_UNSPECIFIED, {NULL,0}, NULL, NULL, NULL, 3}
 
 /**
- * Initialize git_diff_options structure
+ * Initializes a `git_diff_options` with default values. Equivalent to
+ * creating an instance with GIT_DIFF_OPTIONS_INIT.
  *
- * Initializes a `git_diff_options` with default values. Equivalent to creating
- * an instance with GIT_DIFF_OPTIONS_INIT.
- *
- * @param opts The `git_diff_options` struct to initialize.
- * @param version The struct version; pass `GIT_DIFF_OPTIONS_VERSION`.
+ * @param opts The `git_diff_options` struct to initialize
+ * @param version Version of struct; pass `GIT_DIFF_OPTIONS_VERSION`
  * @return Zero on success; -1 on failure.
  */
 GIT_EXTERN(int) git_diff_init_options(
@@ -734,13 +732,11 @@ typedef struct {
 #define GIT_DIFF_FIND_OPTIONS_INIT {GIT_DIFF_FIND_OPTIONS_VERSION}
 
 /**
- * Initialize git_diff_find_options structure
- *
- * Initializes a `git_diff_find_options` with default values. Equivalent to creating
- * an instance with GIT_DIFF_FIND_OPTIONS_INIT.
+ * Initializes a `git_diff_find_options` with default values. Equivalent to
+ * creating an instance with GIT_DIFF_FIND_OPTIONS_INIT.
  *
- * @param opts The `git_diff_find_options` struct to initialize.
- * @param version The struct version; pass `GIT_DIFF_FIND_OPTIONS_VERSION`.
+ * @param opts The `git_diff_find_options` struct to initialize
+ * @param version Version of struct; pass `GIT_DIFF_FIND_OPTIONS_VERSION`
  * @return Zero on success; -1 on failure.
  */
 GIT_EXTERN(int) git_diff_find_init_options(
@@ -1398,13 +1394,12 @@ GIT_EXTERN(int) git_diff_commit_as_email(
 	const git_diff_options *diff_opts);
 
 /**
- * Initialize git_diff_format_email_options structure
+ * Initializes a `git_diff_format_email_options` with default values.
  *
- * Initializes a `git_diff_format_email_options` with default values. Equivalent
- * to creating an instance with GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT.
+ * Equivalent to creating an instance with GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT.
  *
- * @param opts The `git_blame_options` struct to initialize.
- * @param version The struct version; pass `GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION`.
+ * @param opts The `git_diff_format_email_options` struct to initialize
+ * @param version Version of struct; pass `GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION`
  * @return Zero on success; -1 on failure.
  */
 GIT_EXTERN(int) git_diff_format_email_init_options(
@@ -1414,9 +1409,8 @@ GIT_EXTERN(int) git_diff_format_email_init_options(
 /**
  * Patch ID options structure
  *
- * Initialize with `GIT_PATCHID_OPTIONS_INIT`. Alternatively, you can
- * use `git_patchid_init_options`.
- *
+ * Initialize with `GIT_DIFF_PATCHID_OPTIONS_INIT` macro to
+ * correctly set the default values and version.
  */
 typedef struct git_diff_patchid_options {
 	unsigned int version;
@@ -1426,14 +1420,10 @@ typedef struct git_diff_patchid_options {
 #define GIT_DIFF_PATCHID_OPTIONS_INIT { GIT_DIFF_PATCHID_OPTIONS_VERSION }
 
 /**
- * Initialize git_diff_patchid_options structure
+ * Initialize `git_diff_patchid_options` structure.
  *
- * Initializes a `git_diff_patchid_options` with default values. Equivalent to
+ * Initializes the structure with default values. Equivalent to
  * creating an instance with `GIT_DIFF_PATCHID_OPTIONS_INIT`.
- *
- * @param opts The `git_diff_patchid_options` struct to initialize.
- * @param version The struct version; pass `GIT_DIFF_PATCHID_OPTIONS_VERSION`.
- * @return Zero on success; -1 on failure.
  */
 GIT_EXTERN(int) git_diff_patchid_init_options(
 	git_diff_patchid_options *opts,

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

@@ -55,7 +55,6 @@ typedef enum {
 	GIT_ITEROVER        = -31,	/**< Signals end of iteration with iterator */
 	GIT_RETRY           = -32,	/**< Internal only */
 	GIT_EMISMATCH       = -33,	/**< Hashsum mismatch in object */
-	GIT_EINDEXDIRTY     = -34,	/**< Unsaved changes in the index would be overwritten */
 } git_error_code;
 
 /**

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

@@ -59,8 +59,8 @@ GIT_EXTERN(int) git_ignore_clear_internal_rules(
  * given file.  This indicates if the file would be ignored regardless of
  * whether the file is already in the index or committed to the repository.
  *
- * One way to think of this is if you were to do "git check-ignore --no-index"
- * on the given file, would it be shown or not?
+ * One way to think of this is if you were to do "git add ." on the
+ * directory containing the file, would it be added or not?
  *
  * @param ignored boolean returning 0 if the file is not ignored, 1 if it is
  * @param repo a repository object

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

@@ -203,13 +203,12 @@ typedef struct {
 #define GIT_MERGE_FILE_OPTIONS_INIT {GIT_MERGE_FILE_OPTIONS_VERSION}
 
 /**
- * Initialize git_merge_file_options structure
- *
  * Initializes a `git_merge_file_options` with default values. Equivalent to
- * creating an instance with `GIT_MERGE_FILE_OPTIONS_INIT`.
+ * creating an instance with GIT_MERGE_FILE_OPTIONS_INIT.
  *
- * @param opts The `git_merge_file_options` struct to initialize.
- * @param version The struct version; pass `GIT_MERGE_FILE_OPTIONS_VERSION`.
+ * @param opts the `git_merge_file_options` instance to initialize.
+ * @param version the version of the struct; you should pass
+ *        `GIT_MERGE_FILE_OPTIONS_VERSION` here.
  * @return Zero on success; -1 on failure.
  */
 GIT_EXTERN(int) git_merge_file_init_options(
@@ -301,13 +300,12 @@ typedef struct {
 	GIT_MERGE_OPTIONS_VERSION, GIT_MERGE_FIND_RENAMES }
 
 /**
- * Initialize git_merge_options structure
- *
  * Initializes a `git_merge_options` with default values. Equivalent to
- * creating an instance with `GIT_MERGE_OPTIONS_INIT`.
+ * creating an instance with GIT_MERGE_OPTIONS_INIT.
  *
- * @param opts The `git_merge_options` struct to initialize.
- * @param version The struct version; pass `GIT_MERGE_OPTIONS_VERSION`.
+ * @param opts the `git_merge_options` instance to initialize.
+ * @param version the version of the struct; you should pass
+ *        `GIT_MERGE_OPTIONS_VERSION` here.
  * @return Zero on success; -1 on failure.
  */
 GIT_EXTERN(int) git_merge_init_options(

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

@@ -64,8 +64,8 @@ typedef struct {
 	/**
 	 * 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;
 
@@ -80,14 +80,10 @@ typedef struct {
 #define GIT_PROXY_OPTIONS_INIT {GIT_PROXY_OPTIONS_VERSION}
 
 /**
- * Initialize git_proxy_options structure
+ * Initialize a proxy options structure
  *
- * Initializes a `git_proxy_options` with default values. Equivalent to
- * creating an instance with `GIT_PROXY_OPTIONS_INIT`.
- *
- * @param opts The `git_proxy_options` struct to initialize.
- * @param version The struct version; pass `GIT_PROXY_OPTIONS_VERSION`.
- * @return Zero on success; -1 on failure.
+ * @param opts the options struct to initialize
+ * @param version the version of the struct, use `GIT_PROXY_OPTIONS_VERSION`
  */
 GIT_EXTERN(int) git_proxy_init_options(git_proxy_options *opts, unsigned int version);
 

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

@@ -11,8 +11,6 @@
 #include "types.h"
 #include "oid.h"
 #include "annotated_commit.h"
-#include "merge.h"
-#include "checkout.h"
 
 /**
  * @file git2/rebase.h
@@ -147,13 +145,12 @@ typedef struct {
 } git_rebase_operation;
 
 /**
- * Initialize git_rebase_options structure
- *
  * Initializes a `git_rebase_options` with default values. Equivalent to
- * creating an instance with `GIT_REBASE_OPTIONS_INIT`.
+ * creating an instance with GIT_REBASE_OPTIONS_INIT.
  *
- * @param opts The `git_rebase_options` struct to initialize.
- * @param version The struct version; pass `GIT_REBASE_OPTIONS_VERSION`.
+ * @param opts the `git_rebase_options` instance to initialize.
+ * @param version the version of the struct; you should pass
+ *        `GIT_REBASE_OPTIONS_VERSION` here.
  * @return Zero on success; -1 on failure.
  */
 GIT_EXTERN(int) git_rebase_init_options(

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

@@ -710,7 +710,7 @@ GIT_EXTERN(int) git_reference_normalize_name(
  */
 GIT_EXTERN(int) git_reference_peel(
 	git_object **out,
-	git_reference *ref,
+	const git_reference *ref,
 	git_otype type);
 
 /**