rugged 0.27.10 → 0.27.10.1

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

@@ -37,16 +37,14 @@ 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_options_init(
+GIT_EXTERN(int) git_revert_init_options(
 	git_revert_options *opts,
 	unsigned int version);
 

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

@@ -25,15 +25,15 @@ GIT_BEGIN_DECL
  */
 typedef enum {
 	/**
-	 * Sort the output with the same default method from `git`: reverse
-	 * chronological order. This is the default sorting for new walkers.
+	 * Sort the output with the same default time-order method from git.
+	 * This is the default sorting for new walkers.
 	 */
 	GIT_SORT_NONE = 0,
 
 	/**
-	 * Sort the repository contents in topological order (no parents before
-	 * all of its children are shown); this sorting mode can be combined
-	 * with time sorting to produce `git`'s `--date-order``.
+	 * Sort the repository contents in topological order (parents before
+	 * children); this sorting mode can be combined with time sorting to
+	 * produce git's "time-order".
 	 */
 	GIT_SORT_TOPOLOGICAL = 1 << 0,
 
@@ -274,12 +274,12 @@ GIT_EXTERN(git_repository *) git_revwalk_repository(git_revwalk *walk);
  * @param commit_id oid of Commit
  * @param payload User-specified pointer to data to be passed as data payload
  */
-typedef int GIT_CALLBACK(git_revwalk_hide_cb)(
+typedef int(*git_revwalk_hide_cb)(
 	const git_oid *commit_id,
 	void *payload);
 
 /**
- * Adds, changes or removes a callback function to hide a commit and its parents
+ * Adds a callback function to hide a commit and its parents
  *
  * @param walk the revision walker
  * @param hide_cb  callback function to hide a commit and its parents

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

@@ -30,8 +30,8 @@ GIT_BEGIN_DECL
  * @param out new signature, in case of error NULL
  * @param name name of the person
  * @param email email of the person
- * @param time time (in seconds from epoch) when the action happened
- * @param offset timezone offset (in minutes) for the time
+ * @param time time when the action happened
+ * @param offset timezone offset in minutes for the time
  * @return 0 or an error code
  */
 GIT_EXTERN(int) git_signature_new(git_signature **out, const char *name, const char *email, git_time_t time, int offset);

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,
 
@@ -112,22 +110,22 @@ typedef enum {
  * Return 0 to continue processing, or a negative value to
  * abort the stash application.
  */
-typedef int GIT_CALLBACK(git_stash_apply_progress_cb)(
+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_options_init`.
+ * 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;
 
 	/** See `git_stash_apply_flags_t`, above. */
-	uint32_t flags;
+	git_stash_apply_flags flags;
 
 	/** Options to use when writing files to the working directory. */
 	git_checkout_options checkout_options;
@@ -144,16 +142,15 @@ 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_options_init(
+GIT_EXTERN(int) git_stash_apply_init_options(
 	git_stash_apply_options *opts, unsigned int version);
 
 /**
@@ -198,7 +195,7 @@ GIT_EXTERN(int) git_stash_apply(
  * @param payload Extra parameter to callback function.
  * @return 0 to continue iterating or non-zero to stop.
  */
-typedef int GIT_CALLBACK(git_stash_cb)(
+typedef int (*git_stash_cb)(
 	size_t index,
 	const char* message,
 	const git_oid *stash_id,

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
@@ -60,7 +58,7 @@ typedef enum {
  *
  * `payload` is the value you passed to the foreach function as payload.
  */
-typedef int GIT_CALLBACK(git_status_cb)(
+typedef int (*git_status_cb)(
 	const char *path, unsigned int status_flags, void *payload);
 
 /**
@@ -163,36 +161,27 @@ typedef enum {
 /**
  * Options to control how `git_status_foreach_ext()` will issue callbacks.
  *
- * Initialize with `GIT_STATUS_OPTIONS_INIT`. Alternatively, you can
- * use `git_status_options_init`.
+ * This structure is set so that zeroing it out will give you relatively
+ * sane defaults.
  *
+ * The `show` value is one of the `git_status_show_t` constants that
+ * control which files to scan and in what order.
+ *
+ * The `flags` value is an OR'ed combination of the `git_status_opt_t`
+ * values above.
+ *
+ * The `pathspec` is an array of path patterns to match (using
+ * fnmatch-style matching), or just an array of paths to match exactly if
+ * `GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH` is specified in the flags.
+ *
+ * The `baseline` is the tree to be used for comparison to the working directory
+ * and index; defaults to HEAD.
  */
 typedef struct {
-	unsigned int      version; /**< The version */
-
-	/**
-	 * The `show` value is one of the `git_status_show_t` constants that
-	 * control which files to scan and in what order.
-	 */
+	unsigned int      version;
 	git_status_show_t show;
-
-	/**
-	 * The `flags` value is an OR'ed combination of the `git_status_opt_t`
-	 * values above.
-	 */
 	unsigned int      flags;
-
-	/**
-	 * The `pathspec` is an array of path patterns to match (using
-	 * fnmatch-style matching), or just an array of paths to match exactly if
-	 * `GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH` is specified in the flags.
-	 */
 	git_strarray      pathspec;
-
-	/**
-	 * The `baseline` is the tree to be used for comparison to the working directory
-	 * and index; defaults to HEAD.
-	 */
 	git_tree          *baseline;
 } git_status_options;
 
@@ -200,16 +189,14 @@ 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_options_init(
+GIT_EXTERN(int) git_status_init_options(
 	git_status_options *opts,
 	unsigned int version);
 

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

@@ -115,15 +115,16 @@ typedef enum {
  * @param payload value you passed to the foreach function as payload
  * @return 0 on success or error code
  */
-typedef int GIT_CALLBACK(git_submodule_cb)(
+typedef int (*git_submodule_cb)(
 	git_submodule *sm, const char *name, void *payload);
 
 /**
  * Submodule update options structure
  *
- * Initialize with `GIT_SUBMODULE_UPDATE_OPTIONS_INIT`. Alternatively, you can
- * use `git_submodule_update_options_init`.
+ * 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;
@@ -133,7 +134,7 @@ typedef struct git_submodule_update_options {
 	 * checkout, set the `checkout_strategy` to
 	 * `GIT_CHECKOUT_NONE`. Generally you will want the use
 	 * GIT_CHECKOUT_SAFE to update files in the working
-	 * directory.
+	 * directory. 
 	 */
 	git_checkout_options checkout_opts;
 
@@ -159,16 +160,14 @@ 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_options_init(
+GIT_EXTERN(int) git_submodule_update_init_options(
 	git_submodule_update_options *opts, unsigned int version);
 
 /**
@@ -187,7 +186,7 @@ GIT_EXTERN(int) git_submodule_update_options_init(
  *        function works as though GIT_SUBMODULE_UPDATE_OPTIONS_INIT was passed.
  * @return 0 on success, any non-zero return value from a callback
  *         function, or a negative value to indicate an error (use
- *         `git_error_last` for a detailed error message).
+ *         `giterr_last` for a detailed error message).
  */
 GIT_EXTERN(int) git_submodule_update(git_submodule *submodule, int init, git_submodule_update_options *options);
 
@@ -263,8 +262,7 @@ GIT_EXTERN(int) git_submodule_foreach(
  * from the working directory to the new repo.
  *
  * To fully emulate "git submodule add" call this function, then open the
- * submodule repo and perform the clone step as needed (if you don't need
- * anything custom see `git_submodule_add_clone()`). Lastly, call
+ * submodule repo and perform the clone step as needed.  Lastly, call
  * `git_submodule_add_finalize()` to wrap up adding the new submodule and
  * .gitmodules to the index to be ready to commit.
  *
@@ -286,22 +284,6 @@ GIT_EXTERN(int) git_submodule_add_setup(
 	const char *path,
 	int use_gitlink);
 
-/**
- * Perform the clone step for a newly created submodule.
- *
- * This performs the necessary `git_clone` to setup a newly-created submodule.
- *
- * @param out The newly created repository object. Optional.
- * @param submodule The submodule currently waiting for its clone.
- * @param opts The options to use.
- *
- * @return 0 on success, -1 on other errors (see git_clone).
- */
-GIT_EXTERN(int) git_submodule_clone(
-	git_repository **out,
-	git_submodule *submodule,
-	const git_submodule_update_options *opts);
-
 /**
  * Resolve the setup of a new git submodule.
  *

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

@@ -50,7 +50,7 @@ GIT_EXTERN(int) git_commit_create_from_ids(
  * along with the user supplied payload.  This should return a git_oid of
  * the next parent or NULL if all parents have been provided.
  */
-typedef const git_oid * GIT_CALLBACK(git_commit_parent_callback)(size_t idx, void *payload);
+typedef const git_oid *(*git_commit_parent_callback)(size_t idx, void *payload);
 
 /**
  * Create a new commit in the repository with an callback to supply parents.

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

@@ -39,12 +39,12 @@ struct git_config_iterator {
 	 * Return the current entry and advance the iterator. The
 	 * memory belongs to the library.
 	 */
-	int GIT_CALLBACK(next)(git_config_entry **entry, git_config_iterator *iter);
+	int (*next)(git_config_entry **entry, git_config_iterator *iter);
 
 	/**
 	 * Free the iterator
 	 */
-	void GIT_CALLBACK(free)(git_config_iterator *iter);
+	void (*free)(git_config_iterator *iter);
 };
 
 /**
@@ -58,15 +58,15 @@ struct git_config_backend {
 	struct git_config *cfg;
 
 	/* Open means open the file/database and parse if necessary */
-	int GIT_CALLBACK(open)(struct git_config_backend *, git_config_level_t level, const git_repository *repo);
-	int GIT_CALLBACK(get)(struct git_config_backend *, const char *key, git_config_entry **entry);
-	int GIT_CALLBACK(set)(struct git_config_backend *, const char *key, const char *value);
-	int GIT_CALLBACK(set_multivar)(git_config_backend *cfg, const char *name, const char *regexp, const char *value);
-	int GIT_CALLBACK(del)(struct git_config_backend *, const char *key);
-	int GIT_CALLBACK(del_multivar)(struct git_config_backend *, const char *key, const char *regexp);
-	int GIT_CALLBACK(iterator)(git_config_iterator **, struct git_config_backend *);
+	int (*open)(struct git_config_backend *, git_config_level_t level, const git_repository *repo);
+	int (*get)(struct git_config_backend *, const char *key, git_config_entry **entry);
+	int (*set)(struct git_config_backend *, const char *key, const char *value);
+	int (*set_multivar)(git_config_backend *cfg, const char *name, const char *regexp, const char *value);
+	int (*del)(struct git_config_backend *, const char *key);
+	int (*del_multivar)(struct git_config_backend *, const char *key, const char *regexp);
+	int (*iterator)(git_config_iterator **, struct git_config_backend *);
 	/** Produce a read-only version of this backend */
-	int GIT_CALLBACK(snapshot)(struct git_config_backend **, struct git_config_backend *);
+	int (*snapshot)(struct git_config_backend **, struct git_config_backend *);
 	/**
 	 * Lock this backend.
 	 *
@@ -74,14 +74,14 @@ struct git_config_backend {
 	 * backend. Any updates must not be visible to any other
 	 * readers.
 	 */
-	int GIT_CALLBACK(lock)(struct git_config_backend *);
+	int (*lock)(struct git_config_backend *);
 	/**
 	 * Unlock the data store backing this backend. If success is
 	 * true, the changes should be committed, otherwise rolled
 	 * back.
 	 */
-	int GIT_CALLBACK(unlock)(struct git_config_backend *, int success);
-	void GIT_CALLBACK(free)(struct git_config_backend *);
+	int (*unlock)(struct git_config_backend *, int success);
+	void (*free)(struct git_config_backend *);
 };
 #define GIT_CONFIG_BACKEND_VERSION 1
 #define GIT_CONFIG_BACKEND_INIT {GIT_CONFIG_BACKEND_VERSION}

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

@@ -138,7 +138,7 @@ GIT_EXTERN(uint32_t) git_filter_source_flags(const git_filter_source *src);
  * initialization operations (in case libgit2 is being used in a way that
  * doesn't need the filter).
  */
-typedef int GIT_CALLBACK(git_filter_init_fn)(git_filter *self);
+typedef int (*git_filter_init_fn)(git_filter *self);
 
 /**
  * Shutdown callback on filter
@@ -150,7 +150,7 @@ typedef int GIT_CALLBACK(git_filter_init_fn)(git_filter *self);
  *
  * Typically this function will free the `git_filter` object itself.
  */
-typedef void GIT_CALLBACK(git_filter_shutdown_fn)(git_filter *self);
+typedef void (*git_filter_shutdown_fn)(git_filter *self);
 
 /**
  * Callback to decide if a given source needs this filter
@@ -172,7 +172,7 @@ typedef void GIT_CALLBACK(git_filter_shutdown_fn)(git_filter *self);
  * callback can use it.  If a filter allocates and assigns a value to the
  * `payload`, it will need a `cleanup` callback to free the payload.
  */
-typedef int GIT_CALLBACK(git_filter_check_fn)(
+typedef int (*git_filter_check_fn)(
 	git_filter  *self,
 	void       **payload, /* points to NULL ptr on entry, may be set */
 	const git_filter_source *src,
@@ -190,14 +190,14 @@ typedef int GIT_CALLBACK(git_filter_check_fn)(
  * The `payload` value will refer to any payload that was set by the
  * `check` callback.  It may be read from or written to as needed.
  */
-typedef int GIT_CALLBACK(git_filter_apply_fn)(
+typedef int (*git_filter_apply_fn)(
 	git_filter    *self,
 	void         **payload, /* may be read and/or set */
 	git_buf       *to,
 	const git_buf *from,
 	const git_filter_source *src);
 
-typedef int GIT_CALLBACK(git_filter_stream_fn)(
+typedef int (*git_filter_stream_fn)(
 	git_writestream **out,
 	git_filter *self,
 	void **payload,
@@ -212,7 +212,7 @@ typedef int GIT_CALLBACK(git_filter_stream_fn)(
  * allocated a `payload` to keep per-source filter state, use this
  * callback to free that payload and release resources as required.
  */
-typedef void GIT_CALLBACK(git_filter_cleanup_fn)(
+typedef void (*git_filter_cleanup_fn)(
 	git_filter *self,
 	void       *payload);
 

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