rugged 0.27.10 → 0.27.10.1

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
@@ -25,7 +24,7 @@ GIT_BEGIN_DECL
 /**
  * Function type for callbacks from git_odb_foreach.
  */
-typedef int GIT_CALLBACK(git_odb_foreach_cb)(const git_oid *id, void *payload);
+typedef int (*git_odb_foreach_cb)(const git_oid *id, void *payload);
 
 /**
  * Create a new object database with no backends.
@@ -147,7 +146,7 @@ GIT_EXTERN(int) git_odb_read_prefix(git_odb_object **out, git_odb *db, const git
  * - 0 if the object was read;
  * - GIT_ENOTFOUND if the object is not in the database.
  */
-GIT_EXTERN(int) git_odb_read_header(size_t *len_out, git_object_t *type_out, git_odb *db, const git_oid *id);
+GIT_EXTERN(int) git_odb_read_header(size_t *len_out, git_otype *type_out, git_odb *db, const git_oid *id);
 
 /**
  * Determine if the given object can be found in the object database.
@@ -190,9 +189,9 @@ typedef struct git_odb_expand_id {
 
 	/**
 	 * The (optional) type of the object to search for; leave as `0` or set
-	 * to `GIT_OBJECT_ANY` to query for any object matching the ID.
+	 * to `GIT_OBJ_ANY` to query for any object matching the ID.
 	 */
-	git_object_t type;
+	git_otype type;
 } git_odb_expand_id;
 
 /**
@@ -271,7 +270,7 @@ GIT_EXTERN(int) git_odb_foreach(git_odb *db, git_odb_foreach_cb cb, void *payloa
  * @param type type of the data to store
  * @return 0 or an error code
  */
-GIT_EXTERN(int) git_odb_write(git_oid *out, git_odb *odb, const void *data, size_t len, git_object_t type);
+GIT_EXTERN(int) git_odb_write(git_oid *out, git_odb *odb, const void *data, size_t len, git_otype type);
 
 /**
  * Open a stream to write an object into the ODB
@@ -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_otype type);
 
 /**
  * Write to an odb stream
@@ -367,7 +366,7 @@ GIT_EXTERN(void) git_odb_stream_free(git_odb_stream *stream);
 GIT_EXTERN(int) git_odb_open_rstream(
 	git_odb_stream **out,
 	size_t *len,
-	git_object_t *type,
+	git_otype *type,
 	git_odb *db,
 	const git_oid *oid);
 
@@ -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);
 
 /**
@@ -407,7 +406,7 @@ GIT_EXTERN(int) git_odb_write_pack(
  * @param type of the data to hash
  * @return 0 or an error code
  */
-GIT_EXTERN(int) git_odb_hash(git_oid *out, const void *data, size_t len, git_object_t type);
+GIT_EXTERN(int) git_odb_hash(git_oid *out, const void *data, size_t len, git_otype type);
 
 /**
  * Read a file from disk and fill a git_oid with the object id
@@ -422,7 +421,7 @@ GIT_EXTERN(int) git_odb_hash(git_oid *out, const void *data, size_t len, git_obj
  * @param type the type of the object that will be hashed
  * @return 0 or an error code
  */
-GIT_EXTERN(int) git_odb_hashfile(git_oid *out, const char *path, git_object_t type);
+GIT_EXTERN(int) git_odb_hashfile(git_oid *out, const char *path, git_otype type);
 
 /**
  * Create a copy of an odb_object
@@ -488,7 +487,7 @@ GIT_EXTERN(size_t) git_odb_object_size(git_odb_object *object);
  * @param object the object
  * @return the type
  */
-GIT_EXTERN(git_object_t) git_odb_object_type(git_odb_object *object);
+GIT_EXTERN(git_otype) git_odb_object_type(git_odb_object *object);
 
 /**
  * Add a custom backend to an existing Object DB

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,18 +86,18 @@ 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.
 	 */
-	int GIT_CALLBACK(read)(git_odb_stream *stream, char *buffer, size_t len);
+	int (*read)(git_odb_stream *stream, char *buffer, size_t len);
 
 	/**
 	 * Write `len` bytes from `buffer` into the stream.
 	 */
-	int GIT_CALLBACK(write)(git_odb_stream *stream, const char *buffer, size_t len);
+	int (*write)(git_odb_stream *stream, const char *buffer, size_t len);
 
 	/**
 	 * Store the contents of the stream as an object with the id
@@ -110,7 +109,7 @@ struct git_odb_stream {
 	 * - the final number of received bytes differs from the size declared
 	 *   with `git_odb_open_wstream()`
 	 */
-	int GIT_CALLBACK(finalize_write)(git_odb_stream *stream, const git_oid *oid);
+	int (*finalize_write)(git_odb_stream *stream, const git_oid *oid);
 
 	/**
 	 * Free the stream's memory.
@@ -118,16 +117,16 @@ struct git_odb_stream {
 	 * This method might be called without a call to `finalize_write` if
 	 * an error occurs or if the object is already present in the ODB.
 	 */
-	void GIT_CALLBACK(free)(git_odb_stream *stream);
+	void (*free)(git_odb_stream *stream);
 };
 
 /** A stream to write a pack file to the ODB */
 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);
-	void GIT_CALLBACK(free)(git_odb_writepack *writepack);
+	int (*append)(git_odb_writepack *writepack, const void *data, size_t size, git_transfer_progress *stats);
+	int (*commit)(git_odb_writepack *writepack, git_transfer_progress *stats);
+	void (*free)(git_odb_writepack *writepack);
 };
 
 GIT_END_DECL

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
@@ -246,7 +246,7 @@ GIT_EXTERN(git_oid_shorten *) git_oid_shorten_new(size_t min_length);
  * memory-efficient.
  *
  * Attempting to add more than those OIDs will result in a
- * GIT_ERROR_INVALID error
+ * GITERR_INVALID error
  *
  * @param os a `git_oid_shorten` instance
  * @param text_id an OID in text form

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,17 +178,7 @@ 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);
+typedef int (*git_packbuilder_foreach_cb)(void *buf, size_t size, void *payload);
 
 /**
  * Create the new pack and pass each object to the callback
@@ -218,7 +207,7 @@ GIT_EXTERN(size_t) git_packbuilder_object_count(git_packbuilder *pb);
 GIT_EXTERN(size_t) git_packbuilder_written(git_packbuilder *pb);
 
 /** Packbuilder progress notification function */
-typedef int GIT_CALLBACK(git_packbuilder_progress)(
+typedef int (*git_packbuilder_progress)(
 	int stage,
 	uint32_t current,
 	uint32_t total,

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
 
@@ -66,10 +64,10 @@ 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;
+        git_transport_certificate_check_cb certificate_check;
 
 	/**
 	 * Payload to be provided to the credentials and certificate
@@ -82,16 +80,12 @@ typedef struct {
 #define GIT_PROXY_OPTIONS_INIT {GIT_PROXY_OPTIONS_VERSION}
 
 /**
- * Initialize git_proxy_options structure
- *
- * Initializes a `git_proxy_options` with default values. Equivalent to
- * creating an instance with `GIT_PROXY_OPTIONS_INIT`.
+ * Initialize a proxy options structure
  *
- * @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_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

@@ -11,9 +11,6 @@
 #include "types.h"
 #include "oid.h"
 #include "annotated_commit.h"
-#include "merge.h"
-#include "checkout.h"
-#include "commit.h"
 
 /**
  * @file git2/rebase.h
@@ -73,21 +70,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 +116,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
@@ -163,16 +145,15 @@ 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_options_init(
+GIT_EXTERN(int) git_rebase_init_options(
 	git_rebase_options *opts,
 	unsigned int version);
 
@@ -215,34 +196,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

@@ -263,12 +263,12 @@ GIT_EXTERN(const char *) git_reference_symbolic_target(const git_reference *ref)
 /**
  * Get the type of a reference.
  *
- * Either direct (GIT_REFERENCE_DIRECT) or symbolic (GIT_REFERENCE_SYMBOLIC)
+ * Either direct (GIT_REF_OID) or symbolic (GIT_REF_SYMBOLIC)
  *
  * @param ref The reference
  * @return the type
  */
-GIT_EXTERN(git_reference_t) git_reference_type(const git_reference *ref);
+GIT_EXTERN(git_ref_t) git_reference_type(const git_reference *ref);
 
 /**
  * Get the full name of a reference.
@@ -422,27 +422,8 @@ 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);
+typedef int (*git_reference_foreach_cb)(git_reference *reference, void *payload);
+typedef int (*git_reference_foreach_name_cb)(const char *name, void *payload);
 
 /**
  * Perform a callback on each reference in the repository.
@@ -659,7 +640,7 @@ typedef enum {
 	/**
 	 * No particular normalization.
 	 */
-	GIT_REFERENCE_FORMAT_NORMAL = 0u,
+	GIT_REF_FORMAT_NORMAL = 0u,
 
 	/**
 	 * Control whether one-level refnames are accepted
@@ -667,7 +648,7 @@ typedef enum {
 	 * components). Those are expected to be written only using
 	 * uppercase letters and underscore (FETCH_HEAD, ...)
 	 */
-	GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL = (1u << 0),
+	GIT_REF_FORMAT_ALLOW_ONELEVEL = (1u << 0),
 
 	/**
 	 * Interpret the provided name as a reference pattern for a
@@ -676,15 +657,15 @@ typedef enum {
 	 * in place of a one full pathname component
 	 * (e.g., foo/<star>/bar but not foo/bar<star>).
 	 */
-	GIT_REFERENCE_FORMAT_REFSPEC_PATTERN = (1u << 1),
+	GIT_REF_FORMAT_REFSPEC_PATTERN = (1u << 1),
 
 	/**
 	 * Interpret the name as part of a refspec in shorthand form
 	 * so the `ONELEVEL` naming rules aren't enforced and 'master'
 	 * becomes a valid name.
 	 */
-	GIT_REFERENCE_FORMAT_REFSPEC_SHORTHAND = (1u << 2),
-} git_reference_format_t;
+	GIT_REF_FORMAT_REFSPEC_SHORTHAND = (1u << 2),
+} git_reference_normalize_t;
 
 /**
  * Normalize reference name and check validity.
@@ -702,7 +683,7 @@ typedef enum {
  * @param buffer_size Size of buffer_out
  * @param name Reference name to be checked.
  * @param flags Flags to constrain name validation rules - see the
- *              GIT_REFERENCE_FORMAT constants above.
+ *              GIT_REF_FORMAT constants above.
  * @return 0 on success, GIT_EBUFS if buffer is too small, GIT_EINVALIDSPEC
  * or an error code.
  */
@@ -718,19 +699,19 @@ GIT_EXTERN(int) git_reference_normalize_name(
  * The retrieved `peeled` object is owned by the repository
  * and should be closed with the `git_object_free` method.
  *
- * If you pass `GIT_OBJECT_ANY` as the target type, then the object
+ * If you pass `GIT_OBJ_ANY` as the target type, then the object
  * will be peeled until a non-tag object is met.
  *
  * @param out Pointer to the peeled git_object
  * @param ref The reference to be processed
- * @param type The type of the requested object (GIT_OBJECT_COMMIT,
- * GIT_OBJECT_TAG, GIT_OBJECT_TREE, GIT_OBJECT_BLOB or GIT_OBJECT_ANY).
+ * @param type The type of the requested object (GIT_OBJ_COMMIT,
+ * GIT_OBJ_TAG, GIT_OBJ_TREE, GIT_OBJ_BLOB or GIT_OBJ_ANY).
  * @return 0 on success, GIT_EAMBIGUOUS, GIT_ENOTFOUND or an error code
  */
 GIT_EXTERN(int) git_reference_peel(
 	git_object **out,
 	const git_reference *ref,
-	git_object_t type);
+	git_otype type);
 
 /**
  * Ensure the reference name is well-formed.
@@ -762,6 +743,7 @@ GIT_EXTERN(int) git_reference_is_valid_name(const char *refname);
  */
 GIT_EXTERN(const char *) git_reference_shorthand(const git_reference *ref);
 
+
 /** @} */
 GIT_END_DECL
 #endif