rugged 0.28.4 → 0.28.4.1

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

@@ -57,7 +57,7 @@ typedef struct {
  *        `GIT_MERGE_FILE_INPUT_VERSION` here.
  * @return Zero on success; -1 on failure.
  */
-GIT_EXTERN(int) git_merge_file_input_init(
+GIT_EXTERN(int) git_merge_file_init_input(
 	git_merge_file_input *opts,
 	unsigned int version);
 
@@ -192,7 +192,7 @@ typedef struct {
 	git_merge_file_favor_t favor;
 
 	/** see `git_merge_file_flag_t` above */
-	uint32_t flags;
+	git_merge_file_flag_t flags;
 
 	/** The size of conflict markers (eg, "<<<<<<<").  Default is
 	 * GIT_MERGE_CONFLICT_MARKER_SIZE. */
@@ -212,7 +212,9 @@ typedef struct {
  * @param version The struct version; pass `GIT_MERGE_FILE_OPTIONS_VERSION`.
  * @return Zero on success; -1 on failure.
  */
-GIT_EXTERN(int) git_merge_file_options_init(git_merge_file_options *opts, unsigned int version);
+GIT_EXTERN(int) git_merge_file_init_options(
+	git_merge_file_options *opts,
+	unsigned int version);
 
 /**
  * Information about file-level merging
@@ -247,7 +249,7 @@ typedef struct {
 	unsigned int version;
 
 	/** See `git_merge_flag_t` above */
-	uint32_t flags;
+	git_merge_flag_t flags;
 
 	/**
 	 * Similarity to consider a file renamed (default 50).  If
@@ -291,7 +293,7 @@ typedef struct {
 	git_merge_file_favor_t file_favor;
 
 	/** see `git_merge_file_flag_t` above */
-	uint32_t file_flags;
+	git_merge_file_flag_t file_flags;
 } git_merge_options;
 
 #define GIT_MERGE_OPTIONS_VERSION 1
@@ -308,7 +310,9 @@ typedef struct {
  * @param version The struct version; pass `GIT_MERGE_OPTIONS_VERSION`.
  * @return Zero on success; -1 on failure.
  */
-GIT_EXTERN(int) git_merge_options_init(git_merge_options *opts, unsigned int version);
+GIT_EXTERN(int) git_merge_init_options(
+	git_merge_options *opts,
+	unsigned int version);
 
 /**
  * The results of `git_merge_analysis` indicate the merge opportunities.

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

@@ -49,6 +49,11 @@ struct git_remote_head {
 	char *symref_target;
 };
 
+/**
+ * Callback for listing the remote heads
+ */
+typedef int GIT_CALLBACK(git_headlist_cb)(git_remote_head *rhead, void *payload);
+
 /** @} */
 GIT_END_DECL
 #endif

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

@@ -21,8 +21,6 @@
  */
 GIT_BEGIN_DECL
 
-#define GIT_OBJECT_SIZE_MAX UINT64_MAX
-
 /**
  * Lookup a reference to one of the objects in a repository.
  *
@@ -187,6 +185,20 @@ GIT_EXTERN(git_object_t) git_object_string2type(const char *str);
  */
 GIT_EXTERN(int) git_object_typeisloose(git_object_t type);
 
+/**
+ * Get the size in bytes for the structure which
+ * acts as an in-memory representation of any given
+ * object type.
+ *
+ * For all the core types, this would the equivalent
+ * of calling `sizeof(git_commit)` if the core types
+ * were not opaque on the external API.
+ *
+ * @param type object type to get its size
+ * @return size in bytes of the object
+ */
+GIT_EXTERN(size_t) git_object__size(git_object_t type);
+
 /**
  * Recursively peel an object until an object of the specified type is met.
  *

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

@@ -11,7 +11,6 @@
 #include "types.h"
 #include "oid.h"
 #include "oidarray.h"
-#include "indexer.h"
 
 /**
  * @file git2/odb.h
@@ -294,7 +293,7 @@ GIT_EXTERN(int) git_odb_write(git_oid *out, git_odb *odb, const void *data, size
  * @param type type of the object that will be written
  * @return 0 if the stream was created; error code otherwise
  */
-GIT_EXTERN(int) git_odb_open_wstream(git_odb_stream **out, git_odb *db, git_object_size_t size, git_object_t type);
+GIT_EXTERN(int) git_odb_open_wstream(git_odb_stream **out, git_odb *db, git_off_t size, git_object_t type);
 
 /**
  * Write to an odb stream
@@ -392,7 +391,7 @@ GIT_EXTERN(int) git_odb_open_rstream(
 GIT_EXTERN(int) git_odb_write_pack(
 	git_odb_writepack **out,
 	git_odb *db,
-	git_indexer_progress_cb progress_cb,
+	git_transfer_progress_cb progress_cb,
 	void *progress_payload);
 
 /**

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

@@ -9,7 +9,6 @@
 
 #include "common.h"
 #include "types.h"
-#include "indexer.h"
 
 /**
  * @file git2/backend.h
@@ -87,8 +86,8 @@ struct git_odb_stream {
 	unsigned int mode;
 	void *hash_ctx;
 
-	git_object_size_t declared_size;
-	git_object_size_t received_bytes;
+	git_off_t declared_size;
+	git_off_t received_bytes;
 
 	/**
 	 * Write at most `len` bytes into `buffer` and advance the stream.
@@ -125,8 +124,8 @@ struct git_odb_stream {
 struct git_odb_writepack {
 	git_odb_backend *backend;
 
-	int GIT_CALLBACK(append)(git_odb_writepack *writepack, const void *data, size_t size, git_indexer_progress *stats);
-	int GIT_CALLBACK(commit)(git_odb_writepack *writepack, git_indexer_progress *stats);
+	int GIT_CALLBACK(append)(git_odb_writepack *writepack, const void *data, size_t size, git_transfer_progress *stats);
+	int GIT_CALLBACK(commit)(git_odb_writepack *writepack, git_transfer_progress *stats);
 	void GIT_CALLBACK(free)(git_odb_writepack *writepack);
 };
 

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

@@ -207,7 +207,7 @@ GIT_EXTERN(int) git_oid_strcmp(const git_oid *id, const char *str);
  *
  * @return 1 if all zeros, 0 otherwise.
  */
-GIT_EXTERN(int) git_oid_is_zero(const git_oid *id);
+GIT_EXTERN(int) git_oid_iszero(const git_oid *id);
 
 /**
  * OID Shortener object

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

@@ -9,7 +9,6 @@
 
 #include "common.h"
 #include "oid.h"
-#include "indexer.h"
 
 /**
  * @file git2/pack.h
@@ -166,7 +165,7 @@ GIT_EXTERN(int) git_packbuilder_write(
 	git_packbuilder *pb,
 	const char *path,
 	unsigned int mode,
-	git_indexer_progress_cb progress_cb,
+	git_transfer_progress_cb progress_cb,
 	void *progress_cb_payload);
 
 /**
@@ -179,16 +178,6 @@ GIT_EXTERN(int) git_packbuilder_write(
 */
 GIT_EXTERN(const git_oid *) git_packbuilder_hash(git_packbuilder *pb);
 
-/**
- * Callback used to iterate over packed objects
- *
- * @see git_packbuilder_foreach
- *
- * @param buf A pointer to the object's data
- * @param size The size of the underlying object
- * @param payload Payload passed to git_packbuilder_foreach
- * @return non-zero to terminate the iteration
- */
 typedef int GIT_CALLBACK(git_packbuilder_foreach_cb)(void *buf, size_t size, void *payload);
 
 /**

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

@@ -8,9 +8,7 @@
 #define INCLUDE_git_proxy_h__
 
 #include "common.h"
-
-#include "cert.h"
-#include "cred.h"
+#include "transport.h"
 
 GIT_BEGIN_DECL
 
@@ -69,7 +67,7 @@ typedef struct {
 	 * connection to proceed. Returns 0 to allow the connection
 	 * or a negative value to indicate an error.
 	 */
-	git_transport_certificate_check_cb certificate_check;
+        git_transport_certificate_check_cb certificate_check;
 
 	/**
 	 * Payload to be provided to the credentials and certificate
@@ -91,7 +89,7 @@ typedef struct {
  * @param version The struct version; pass `GIT_PROXY_OPTIONS_VERSION`.
  * @return Zero on success; -1 on failure.
  */
-GIT_EXTERN(int) git_proxy_options_init(git_proxy_options *opts, unsigned int version);
+GIT_EXTERN(int) git_proxy_init_options(git_proxy_options *opts, unsigned int version);
 
 GIT_END_DECL
 

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

@@ -13,7 +13,6 @@
 #include "annotated_commit.h"
 #include "merge.h"
 #include "checkout.h"
-#include "commit.h"
 
 /**
  * @file git2/rebase.h
@@ -73,21 +72,6 @@ typedef struct {
 	 * `abort` to match git semantics.
 	 */
 	git_checkout_options checkout_options;
-
-	/**
-	 * If provided, this will be called with the commit content, allowing
-	 * a signature to be added to the rebase commit. Can be skipped with
-	 * GIT_PASSTHROUGH. If GIT_PASSTHROUGH is returned, a commit will be made
-	 * without a signature.
-	 * This field is only used when performing git_rebase_commit.
-	 */
-	git_commit_signing_cb signing_cb;
-
-	/**
-	 * This will be passed to each of the callbacks in this struct
-	 * as the last parameter.
-	 */
-	void *payload;
 } git_rebase_options;
 
 /**
@@ -134,7 +118,7 @@ typedef enum {
 #define GIT_REBASE_OPTIONS_VERSION 1
 #define GIT_REBASE_OPTIONS_INIT \
 	{ GIT_REBASE_OPTIONS_VERSION, 0, 0, NULL, GIT_MERGE_OPTIONS_INIT, \
-	  GIT_CHECKOUT_OPTIONS_INIT, NULL, NULL }
+	  GIT_CHECKOUT_OPTIONS_INIT}
 
 /** Indicates that a rebase operation is not (yet) in progress. */
 #define GIT_REBASE_NO_OPERATION SIZE_MAX
@@ -172,7 +156,7 @@ typedef struct {
  * @param version The struct version; pass `GIT_REBASE_OPTIONS_VERSION`.
  * @return Zero on success; -1 on failure.
  */
-GIT_EXTERN(int) git_rebase_options_init(
+GIT_EXTERN(int) git_rebase_init_options(
 	git_rebase_options *opts,
 	unsigned int version);
 
@@ -215,34 +199,6 @@ GIT_EXTERN(int) git_rebase_open(
 	git_repository *repo,
 	const git_rebase_options *opts);
 
-/**
- * Gets the original `HEAD` ref name for merge rebases.
- *
- * @return The original `HEAD` ref name
- */
-GIT_EXTERN(const char *) git_rebase_orig_head_name(git_rebase *rebase);
-
-/**
- * Gets the original `HEAD` id for merge rebases.
- *
- * @return The original `HEAD` id
- */
-GIT_EXTERN(const git_oid *) git_rebase_orig_head_id(git_rebase *rebase);
-
-/**
- * Gets the `onto` ref name for merge rebases.
- *
- * @return The `onto` ref name
- */
-GIT_EXTERN(const char *) git_rebase_onto_name(git_rebase *rebase);
-
-/**
- * Gets the `onto` id for merge rebases.
- *
- * @return The `onto` id
- */
-GIT_EXTERN(const git_oid *) git_rebase_onto_id(git_rebase *rebase);
-
 /**
  * Gets the count of rebase operations that are to be applied.
  *

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

@@ -422,26 +422,7 @@ GIT_EXTERN(int) git_reference_remove(git_repository *repo, const char *name);
  */
 GIT_EXTERN(int) git_reference_list(git_strarray *array, git_repository *repo);
 
-/**
- * Callback used to iterate over references
- *
- * @see git_reference_foreach
- *
- * @param reference The reference object
- * @param payload Payload passed to git_reference_foreach
- * @return non-zero to terminate the iteration
- */
 typedef int GIT_CALLBACK(git_reference_foreach_cb)(git_reference *reference, void *payload);
-
-/**
- * Callback used to iterate over reference names
- *
- * @see git_reference_foreach_name
- *
- * @param name The reference name
- * @param payload Payload passed to git_reference_foreach_name
- * @return non-zero to terminate the iteration
- */
 typedef int GIT_CALLBACK(git_reference_foreach_name_cb)(const char *name, void *payload);
 
 /**

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

@@ -56,7 +56,7 @@ typedef enum {
  * Remote creation options structure
  *
  * Initialize with `GIT_REMOTE_CREATE_OPTIONS_INIT`. Alternatively, you can
- * use `git_remote_create_options_init`.
+ * use `git_remote_create_init_options`.
  *
  */
 typedef struct git_remote_create_options {
@@ -94,7 +94,7 @@ typedef struct git_remote_create_options {
  * @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_EXTERN(int) git_remote_create_init_options(
 		git_remote_create_options *opts,
 		unsigned int version);
 
@@ -415,19 +415,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_CALLBACK(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
  */
@@ -474,20 +473,6 @@ typedef int GIT_CALLBACK(git_push_negotiation)(const git_push_update **updates,
  */
 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);
-
 /**
  * The callback settings structure
  *
@@ -495,8 +480,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 +492,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 GIT_CALLBACK(completion)(git_remote_completion_type type, void *data);
 
 	/**
 	 * This will be called if the remote host requires
@@ -532,7 +516,7 @@ 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
@@ -553,7 +537,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 +561,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 +578,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
@@ -702,7 +679,7 @@ typedef struct {
  * @param version The struct version; pass `GIT_FETCH_OPTIONS_VERSION`.
  * @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);
 
@@ -752,7 +729,7 @@ typedef struct {
  * @param version The struct version; pass `GIT_PUSH_OPTIONS_VERSION`.
  * @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 +832,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