rugged 0.27.10 → 0.27.10.1

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

@@ -41,80 +41,6 @@ GIT_EXTERN(int) git_remote_create(
 		const char *name,
 		const char *url);
 
-/**
- * Remote creation options flags
- */
-typedef enum {
-	/** Ignore the repository apply.insteadOf configuration */
-	GIT_REMOTE_CREATE_SKIP_INSTEADOF = (1 << 0),
-
-	/** Don't build a fetchspec from the name if none is set */
-	GIT_REMOTE_CREATE_SKIP_DEFAULT_FETCHSPEC = (1 << 1),
-} git_remote_create_flags;
-
-/**
- * Remote creation options structure
- *
- * Initialize with `GIT_REMOTE_CREATE_OPTIONS_INIT`. Alternatively, you can
- * use `git_remote_create_options_init`.
- *
- */
-typedef struct git_remote_create_options {
-	unsigned int version;
-
-	/**
-	 * The repository that should own the remote.
-	 * Setting this to NULL results in a detached remote.
-	 */
-	git_repository *repository;
-
-	/**
-	 * The remote's name.
-	 * Setting this to NULL results in an in-memory/anonymous remote.
-	 */
-	const char *name;
-
-	/** The fetchspec the remote should use. */
-	const char *fetchspec;
-
-	/** Additional flags for the remote. See git_remote_create_flags. */
-	unsigned int flags;
-} git_remote_create_options;
-
-#define GIT_REMOTE_CREATE_OPTIONS_VERSION 1
-#define GIT_REMOTE_CREATE_OPTIONS_INIT {GIT_REMOTE_CREATE_OPTIONS_VERSION}
-
-/**
- * Initialize git_remote_create_options structure
- *
- * Initializes a `git_remote_create_options` with default values. Equivalent to
- * creating an instance with `GIT_REMOTE_CREATE_OPTIONS_INIT`.
- *
- * @param opts The `git_remote_create_options` struct to initialize.
- * @param version The struct version; pass `GIT_REMOTE_CREATE_OPTIONS_VERSION`.
- * @return Zero on success; -1 on failure.
- */
-GIT_EXTERN(int) git_remote_create_options_init(
-		git_remote_create_options *opts,
-		unsigned int version);
-
-/**
- * Create a remote, with options.
- *
- * This function allows more fine-grained control over the remote creation.
- *
- * Passing NULL as the opts argument will result in a detached remote.
- *
- * @param out the resulting remote
- * @param url the remote's url
- * @param opts the remote creation options
- * @return 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code
- */
-GIT_EXTERN(int) git_remote_create_with_opts(
-		git_remote **out,
-		const char *url,
-		const git_remote_create_options *opts);
-
 /**
  * Add a remote with the provided fetch refspec (or default if NULL) to the repository's
  * configuration.
@@ -415,19 +341,18 @@ GIT_EXTERN(int) git_remote_list(git_strarray *out, git_repository *repo);
  * Argument to the completion callback which tells it which operation
  * finished.
  */
-typedef enum git_remote_completion_t {
+typedef enum git_remote_completion_type {
 	GIT_REMOTE_COMPLETION_DOWNLOAD,
 	GIT_REMOTE_COMPLETION_INDEXING,
 	GIT_REMOTE_COMPLETION_ERROR,
-} git_remote_completion_t;
+} git_remote_completion_type;
 
 /** Push network progress notification function */
-typedef int GIT_CALLBACK(git_push_transfer_progress_cb)(
+typedef int (*git_push_transfer_progress)(
 	unsigned int current,
 	unsigned int total,
 	size_t bytes,
 	void* payload);
-
 /**
  * Represents an update which will be performed on the remote during push
  */
@@ -458,7 +383,7 @@ typedef struct {
  * @param len number of elements in `updates`
  * @param payload Payload provided by the caller
  */
-typedef int GIT_CALLBACK(git_push_negotiation)(const git_push_update **updates, size_t len, void *payload);
+typedef int (*git_push_negotiation)(const git_push_update **updates, size_t len, void *payload);
 
 /**
  * Callback used to inform of the update status from the remote.
@@ -472,21 +397,7 @@ typedef int GIT_CALLBACK(git_push_negotiation)(const git_push_update **updates,
  * @param data data provided by the caller
  * @return 0 on success, otherwise an error
  */
-typedef int GIT_CALLBACK(git_push_update_reference_cb)(const char *refname, const char *status, void *data);
-
-/**
- * Callback to resolve URLs before connecting to remote
- *
- * If you return GIT_PASSTHROUGH, you don't need to write anything to
- * url_resolved.
- *
- * @param url_resolved The buffer to write the resolved URL to
- * @param url The URL to resolve
- * @param direction GIT_DIRECTION_FETCH or GIT_DIRECTION_PUSH
- * @param payload Payload provided by the caller
- * @return 0 on success, GIT_PASSTHROUGH or an error
- */
-typedef int GIT_CALLBACK(git_url_resolve_cb)(git_buf *url_resolved, const char *url, int direction, void *payload);
+typedef int (*git_push_update_reference_cb)(const char *refname, const char *status, void *data);
 
 /**
  * The callback settings structure
@@ -495,8 +406,7 @@ typedef int GIT_CALLBACK(git_url_resolve_cb)(git_buf *url_resolved, const char *
  * about the progress of the network operations.
  */
 struct git_remote_callbacks {
-	unsigned int version; /**< The version */
-
+	unsigned int version;
 	/**
 	 * Textual progress from the remote. Text send over the
 	 * progress side-band will be passed to this function (this is
@@ -508,7 +418,7 @@ struct git_remote_callbacks {
 	 * Completion is called when different parts of the download
 	 * process are done (currently unused).
 	 */
-	int GIT_CALLBACK(completion)(git_remote_completion_t type, void *data);
+	int (*completion)(git_remote_completion_type type, void *data);
 
 	/**
 	 * This will be called if the remote host requires
@@ -522,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;
 
@@ -532,13 +442,13 @@ struct git_remote_callbacks {
 	 * called with the current count of progress done by the
 	 * indexer.
 	 */
-	git_indexer_progress_cb transfer_progress;
+	git_transfer_progress_cb transfer_progress;
 
 	/**
 	 * Each time a reference is updated locally, this function
 	 * will be called with information about it.
 	 */
-	int GIT_CALLBACK(update_tips)(const char *refname, const git_oid *a, const git_oid *b, void *data);
+	int (*update_tips)(const char *refname, const git_oid *a, const git_oid *b, void *data);
 
 	/**
 	 * Function to call with progress information during pack
@@ -553,7 +463,7 @@ struct git_remote_callbacks {
 	 * inline with pack building operations, so performance may be
 	 * affected.
 	 */
-	git_push_transfer_progress_cb push_transfer_progress;
+	git_push_transfer_progress push_transfer_progress;
 
 	/**
 	 * See documentation of git_push_update_reference_cb
@@ -577,12 +487,6 @@ struct git_remote_callbacks {
 	 * as the last parameter.
 	 */
 	void *payload;
-
-	/**
-	 * Resolve URL before connecting to remote.
-	 * The returned URL will be used to connect to the remote instead.
-	 */
-	git_url_resolve_cb resolve_url;
 };
 
 #define GIT_REMOTE_CALLBACKS_VERSION 1
@@ -600,7 +504,6 @@ GIT_EXTERN(int) git_remote_init_callbacks(
 	git_remote_callbacks *opts,
 	unsigned int version);
 
-/** Acceptable prune settings when fetching */
 typedef enum {
 	/**
 	 * Use the setting from the configuration
@@ -693,16 +596,15 @@ 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_options_init(
+GIT_EXTERN(int) git_fetch_init_options(
 	git_fetch_options *opts,
 	unsigned int version);
 
@@ -740,19 +642,18 @@ typedef struct {
 } git_push_options;
 
 #define GIT_PUSH_OPTIONS_VERSION 1
-#define GIT_PUSH_OPTIONS_INIT { GIT_PUSH_OPTIONS_VERSION, 1, GIT_REMOTE_CALLBACKS_INIT, GIT_PROXY_OPTIONS_INIT }
+#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_options_init(
+GIT_EXTERN(int) git_push_init_options(
 	git_push_options *opts,
 	unsigned int version);
 
@@ -855,7 +756,7 @@ GIT_EXTERN(int) git_remote_push(git_remote *remote,
 /**
  * Get the statistics structure that is filled in by the fetch operation.
  */
-GIT_EXTERN(const git_indexer_progress *) git_remote_stats(git_remote *remote);
+GIT_EXTERN(const git_transfer_progress *) git_remote_stats(git_remote *remote);
 
 /**
  * Retrieve the tag auto-follow setting

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

@@ -94,53 +94,40 @@ GIT_EXTERN(int) git_repository_discover(
 
 /**
  * Option flags for `git_repository_open_ext`.
+ *
+ * * GIT_REPOSITORY_OPEN_NO_SEARCH - Only open the repository if it can be
+ *   immediately found in the start_path.  Do not walk up from the
+ *   start_path looking at parent directories.
+ * * GIT_REPOSITORY_OPEN_CROSS_FS - Unless this flag is set, open will not
+ *   continue searching across filesystem boundaries (i.e. when `st_dev`
+ *   changes from the `stat` system call).  (E.g. Searching in a user's home
+ *   directory "/home/user/source/" will not return "/.git/" as the found
+ *   repo if "/" is a different filesystem than "/home".)
+ * * GIT_REPOSITORY_OPEN_BARE - Open repository as a bare repo regardless
+ *   of core.bare config, and defer loading config file for faster setup.
+ *   Unlike `git_repository_open_bare`, this can follow gitlinks.
+ * * GIT_REPOSITORY_OPEN_NO_DOTGIT - Do not check for a repository by
+ *   appending /.git to the start_path; only open the repository if
+ *   start_path itself points to the git directory.
+ * * GIT_REPOSITORY_OPEN_FROM_ENV - Find and open a git repository,
+ *   respecting the environment variables used by the git command-line
+ *   tools. If set, `git_repository_open_ext` will ignore the other
+ *   flags and the `ceiling_dirs` argument, and will allow a NULL `path`
+ *   to use `GIT_DIR` or search from the current directory. The search
+ *   for a repository will respect $GIT_CEILING_DIRECTORIES and
+ *   $GIT_DISCOVERY_ACROSS_FILESYSTEM.  The opened repository will
+ *   respect $GIT_INDEX_FILE, $GIT_NAMESPACE, $GIT_OBJECT_DIRECTORY, and
+ *   $GIT_ALTERNATE_OBJECT_DIRECTORIES.  In the future, this flag will
+ *   also cause `git_repository_open_ext` to respect $GIT_WORK_TREE and
+ *   $GIT_COMMON_DIR; currently, `git_repository_open_ext` with this
+ *   flag will error out if either $GIT_WORK_TREE or $GIT_COMMON_DIR is
+ *   set.
  */
 typedef enum {
-	/**
-	 * Only open the repository if it can be immediately found in the
-	 * start_path. Do not walk up from the start_path looking at parent
-	 * directories.
-	 */
 	GIT_REPOSITORY_OPEN_NO_SEARCH = (1 << 0),
-
-	/**
-	 * Unless this flag is set, open will not continue searching across
-	 * filesystem boundaries (i.e. when `st_dev` changes from the `stat`
-	 * system call).  For example, searching in a user's home directory at
-	 * "/home/user/source/" will not return "/.git/" as the found repo if
-	 * "/" is a different filesystem than "/home".
-	 */
 	GIT_REPOSITORY_OPEN_CROSS_FS  = (1 << 1),
-
-	/**
-	 * Open repository as a bare repo regardless of core.bare config, and
-	 * defer loading config file for faster setup.
-	 * Unlike `git_repository_open_bare`, this can follow gitlinks.
-	 */
 	GIT_REPOSITORY_OPEN_BARE      = (1 << 2),
-
-	/**
-	 * Do not check for a repository by appending /.git to the start_path;
-	 * only open the repository if start_path itself points to the git
-	 * directory.
-	 */
 	GIT_REPOSITORY_OPEN_NO_DOTGIT = (1 << 3),
-
-	/**
-	 * Find and open a git repository, respecting the environment variables
-	 * used by the git command-line tools.
-	 * If set, `git_repository_open_ext` will ignore the other flags and
-	 * the `ceiling_dirs` argument, and will allow a NULL `path` to use
-	 * `GIT_DIR` or search from the current directory.
-	 * The search for a repository will respect $GIT_CEILING_DIRECTORIES and
-	 * $GIT_DISCOVERY_ACROSS_FILESYSTEM.  The opened repository will
-	 * respect $GIT_INDEX_FILE, $GIT_NAMESPACE, $GIT_OBJECT_DIRECTORY, and
-	 * $GIT_ALTERNATE_OBJECT_DIRECTORIES.
-	 * In the future, this flag will also cause `git_repository_open_ext`
-	 * to respect $GIT_WORK_TREE and $GIT_COMMON_DIR; currently,
-	 * `git_repository_open_ext` with this flag will error out if either
-	 * $GIT_WORK_TREE or $GIT_COMMON_DIR is set.
-	 */
 	GIT_REPOSITORY_OPEN_FROM_ENV  = (1 << 4),
 } git_repository_open_flag_t;
 
@@ -314,16 +301,14 @@ 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_options_init(
+GIT_EXTERN(int) git_repository_init_init_options(
 	git_repository_init_options *opts,
 	unsigned int version);
 
@@ -383,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
@@ -438,8 +423,7 @@ typedef enum {
 	GIT_REPOSITORY_ITEM_HOOKS,
 	GIT_REPOSITORY_ITEM_LOGS,
 	GIT_REPOSITORY_ITEM_MODULES,
-	GIT_REPOSITORY_ITEM_WORKTREES,
-	GIT_REPOSITORY_ITEM__LAST
+	GIT_REPOSITORY_ITEM_WORKTREES
 } git_repository_item_t;
 
 /**
@@ -641,19 +625,7 @@ GIT_EXTERN(int) git_repository_message_remove(git_repository *repo);
  */
 GIT_EXTERN(int) git_repository_state_cleanup(git_repository *repo);
 
-/**
- * Callback used to iterate over each FETCH_HEAD entry
- *
- * @see git_repository_fetchhead_foreach
- *
- * @param ref_name The reference name
- * @param remote_url The remote URL
- * @param oid The reference target OID
- * @param is_merge Was the reference the result of a merge
- * @param payload Payload passed to git_repository_fetchhead_foreach
- * @return non-zero to terminate the iteration
- */
-typedef int GIT_CALLBACK(git_repository_fetchhead_foreach_cb)(const char *ref_name,
+typedef int (*git_repository_fetchhead_foreach_cb)(const char *ref_name,
 	const char *remote_url,
 	const git_oid *oid,
 	unsigned int is_merge,
@@ -675,16 +647,7 @@ GIT_EXTERN(int) git_repository_fetchhead_foreach(
 	git_repository_fetchhead_foreach_cb callback,
 	void *payload);
 
-/**
- * Callback used to iterate over each MERGE_HEAD entry
- *
- * @see git_repository_mergehead_foreach
- *
- * @param oid The merge OID
- * @param payload Payload passed to git_repository_mergehead_foreach
- * @return non-zero to terminate the iteration
- */
-typedef int GIT_CALLBACK(git_repository_mergehead_foreach_cb)(const git_oid *oid,
+typedef int (*git_repository_mergehead_foreach_cb)(const git_oid *oid,
 	void *payload);
 
 /**
@@ -720,7 +683,7 @@ GIT_EXTERN(int) git_repository_mergehead_foreach(
  * @param repo Repository pointer
  * @param path Path to file on disk whose contents should be hashed. If the
  *             repository is not NULL, this can be a relative path.
- * @param type The object type to hash as (e.g. GIT_OBJECT_BLOB)
+ * @param type The object type to hash as (e.g. GIT_OBJ_BLOB)
  * @param as_path The path to use to look up filtering rules. If this is
  *             NULL, then the `path` parameter will be used instead. If
  *             this is passed as the empty string, then no filters will be
@@ -731,7 +694,7 @@ GIT_EXTERN(int) git_repository_hashfile(
 	git_oid *out,
 	git_repository *repo,
 	const char *path,
-	git_object_t type,
+	git_otype type,
 	const char *as_path);
 
 /**