rugged 0.28.4 → 0.28.4.1

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

@@ -323,7 +323,7 @@ typedef struct {
  * @param version The struct version; 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);
 
@@ -438,8 +438,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,18 +640,6 @@ 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,
 	const char *remote_url,
 	const git_oid *oid,
@@ -675,15 +662,6 @@ 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,
 	void *payload);
 

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

@@ -46,7 +46,7 @@ typedef struct {
  * @param version The struct version; 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/stash.h

@@ -120,14 +120,14 @@ typedef int GIT_CALLBACK(git_stash_apply_progress_cb)(
  * Stash application options structure
  *
  * Initialize with `GIT_STASH_APPLY_OPTIONS_INIT`. Alternatively, you can
- * use `git_stash_apply_options_init`.
+ * use `git_stash_apply_init_options`.
  *
  */
 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;
@@ -153,7 +153,7 @@ typedef struct git_stash_apply_options {
  * @param version The struct version; pass `GIT_STASH_APPLY_OPTIONS_VERSION`.
  * @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);
 
 /**

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

@@ -163,36 +163,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;
 
@@ -209,7 +200,7 @@ typedef struct {
  * @param version The struct version; 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

@@ -122,7 +122,7 @@ typedef int GIT_CALLBACK(git_submodule_cb)(
  * Submodule update options structure
  *
  * Initialize with `GIT_SUBMODULE_UPDATE_OPTIONS_INIT`. Alternatively, you can
- * use `git_submodule_update_options_init`.
+ * use `git_submodule_update_init_options`.
  *
  */
 typedef struct git_submodule_update_options {
@@ -168,7 +168,7 @@ typedef struct git_submodule_update_options {
  * @param version The struct version; 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);
 
 /**
@@ -263,8 +263,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 +285,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/alloc.h

@@ -21,51 +21,51 @@ GIT_BEGIN_DECL
  * that all fields need to be set to a proper function.
  */
 typedef struct {
-	/** Allocate `n` bytes of memory */
+	/* Allocate `n` bytes of memory */
 	void * GIT_CALLBACK(gmalloc)(size_t n, const char *file, int line);
 
-	/**
+	/*
 	 * Allocate memory for an array of `nelem` elements, where each element
 	 * has a size of `elsize`. Returned memory shall be initialized to
 	 * all-zeroes
 	 */
 	void * GIT_CALLBACK(gcalloc)(size_t nelem, size_t elsize, const char *file, int line);
 
-	/** Allocate memory for the string `str` and duplicate its contents. */
+	/* Allocate memory for the string `str` and duplicate its contents. */
 	char * GIT_CALLBACK(gstrdup)(const char *str, const char *file, int line);
 
-	/**
+	/*
 	 * Equivalent to the `gstrdup` function, but only duplicating at most
 	 * `n + 1` bytes
 	 */
 	char * GIT_CALLBACK(gstrndup)(const char *str, size_t n, const char *file, int line);
 
-	/**
+	/*
 	 * Equivalent to `gstrndup`, but will always duplicate exactly `n` bytes
 	 * of `str`. Thus, out of bounds reads at `str` may happen.
 	 */
 	char * GIT_CALLBACK(gsubstrdup)(const char *str, size_t n, const char *file, int line);
 
-	/**
+	/*
 	 * This function shall deallocate the old object `ptr` and return a
 	 * pointer to a new object that has the size specified by `size`. In
 	 * case `ptr` is `NULL`, a new array shall be allocated.
 	 */
 	void * GIT_CALLBACK(grealloc)(void *ptr, size_t size, const char *file, int line);
 
-	/**
+	/*
 	 * This function shall be equivalent to `grealloc`, but allocating
 	 * `neleme * elsize` bytes.
 	 */
 	void * GIT_CALLBACK(greallocarray)(void *ptr, size_t nelem, size_t elsize, const char *file, int line);
 
-	/**
+	/*
 	 * This function shall allocate a new array of `nelem` elements, where
 	 * each element has a size of `elsize` bytes.
 	 */
 	void * GIT_CALLBACK(gmallocarray)(size_t nelem, size_t elsize, const char *file, int line);
 
-	/**
+	/*
 	 * This function shall free the memory pointed to by `ptr`. In case
 	 * `ptr` is `NULL`, this shall be a no-op.
 	 */

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

@@ -30,8 +30,8 @@ struct git_odb_backend {
 
 	/* read and read_prefix each return to libgit2 a buffer which
 	 * will be freed later. The buffer should be allocated using
-	 * the function git_odb_backend_data_alloc to ensure that libgit2
-	 * can safely free it later. */
+	 * the function git_odb_backend_malloc to ensure that it can
+	 * be safely freed later. */
 	int GIT_CALLBACK(read)(
 		void **, size_t *, git_object_t *, git_odb_backend *, const git_oid *);
 
@@ -53,7 +53,7 @@ struct git_odb_backend {
 		git_odb_backend *, const git_oid *, const void *, size_t, git_object_t);
 
 	int GIT_CALLBACK(writestream)(
-		git_odb_stream **, git_odb_backend *, git_object_size_t, git_object_t);
+		git_odb_stream **, git_odb_backend *, git_off_t, git_object_t);
 
 	int GIT_CALLBACK(readstream)(
 		git_odb_stream **, size_t *, git_object_t *,
@@ -82,7 +82,7 @@ struct git_odb_backend {
 
 	int GIT_CALLBACK(writepack)(
 		git_odb_writepack **, git_odb_backend *, git_odb *odb,
-		git_indexer_progress_cb progress_cb, void *progress_payload);
+		git_transfer_progress_cb progress_cb, void *progress_payload);
 
 	/**
 	 * "Freshens" an already existing object, updating its last-used
@@ -117,52 +117,8 @@ GIT_EXTERN(int) git_odb_init_backend(
 	git_odb_backend *backend,
 	unsigned int version);
 
-/**
- * Allocate data for an ODB object.  Custom ODB backends may use this
- * to provide data back to the ODB from their read function.  This
- * memory should not be freed once it is returned to libgit2.  If a
- * custom ODB uses this function but encounters an error and does not
- * return this data to libgit2, then they should use the corresponding
- * git_odb_backend_data_free function.
- *
- * @param backend the ODB backend that is allocating this memory
- * @param len the number of bytes to allocate
- * @return the allocated buffer on success or NULL if out of memory
- */
-GIT_EXTERN(void *) git_odb_backend_data_alloc(git_odb_backend *backend, size_t len);
-
-/**
- * Frees custom allocated ODB data.  This should only be called when
- * memory allocated using git_odb_backend_data_alloc is not returned
- * to libgit2 because the backend encountered an error in the read
- * function after allocation and did not return this data to libgit2.
- *
- * @param backend the ODB backend that is freeing this memory
- * @param data the buffer to free
- */
-GIT_EXTERN(void) git_odb_backend_data_free(git_odb_backend *backend, void *data);
-
-
-/*
- * Users can avoid deprecated functions by defining `GIT_DEPRECATE_HARD`.
- */
-#ifndef GIT_DEPRECATE_HARD
-
-/**
- * Allocate memory for an ODB object from a custom backend.  This is
- * an alias of `git_odb_backend_data_alloc` and is preserved for
- * backward compatibility.
- *
- * This function is deprecated, but there is no plan to remove this
- * function at this time.
- *
- * @deprecated git_odb_backend_data_alloc
- * @see git_odb_backend_data_alloc
- */
 GIT_EXTERN(void *) git_odb_backend_malloc(git_odb_backend *backend, size_t len);
 
-#endif
-
 GIT_END_DECL
 
 #endif

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

@@ -58,12 +58,11 @@ struct git_reference_iterator {
 
 /** An instance for a custom backend */
 struct git_refdb_backend {
-	unsigned int version; /**< The backend API version */
+	unsigned int version;
 
 	/**
-	 * Queries the refdb backend for the existence of a reference.
-	 *
-	 * A refdb implementation must provide this function.
+	 * Queries the refdb backend to determine if the given ref_name
+	 * exists.  A refdb implementation must provide this function.
 	 */
 	int GIT_CALLBACK(exists)(
 		int *exists,
@@ -71,9 +70,8 @@ struct git_refdb_backend {
 		const char *ref_name);
 
 	/**
-	 * Queries the refdb backend for a given reference.
-	 *
-	 * A refdb implementation must provide this function.
+	 * Queries the refdb backend for a given reference.  A refdb
+	 * implementation must provide this function.
 	 */
 	int GIT_CALLBACK(lookup)(
 		git_reference **out,
@@ -90,116 +88,82 @@ struct git_refdb_backend {
 		struct git_refdb_backend *backend,
 		const char *glob);
 
-	/**
-	 * Writes the given reference to the refdb.
-	 *
-	 * A refdb implementation must provide this function.
+	/*
+	 * Writes the given reference to the refdb.  A refdb implementation
+	 * must provide this function.
 	 */
 	int GIT_CALLBACK(write)(git_refdb_backend *backend,
 		     const git_reference *ref, int force,
 		     const git_signature *who, const char *message,
 		     const git_oid *old, const char *old_target);
 
-	/**
-	 * Rename a reference in the refdb.
-	 *
-	 * A refdb implementation must provide this function.
-	 */
 	int GIT_CALLBACK(rename)(
 		git_reference **out, git_refdb_backend *backend,
 		const char *old_name, const char *new_name, int force,
 		const git_signature *who, const char *message);
 
 	/**
-	 * Deletes the given reference from the refdb.
-	 *
-	 * If it exists, its reflog should be deleted as well.
-	 *
-	 * A refdb implementation must provide this function.
+	 * Deletes the given reference (and if necessary its reflog)
+	 * from the refdb.  A refdb implementation must provide this
+	 * function.
 	 */
 	int GIT_CALLBACK(del)(git_refdb_backend *backend, const char *ref_name, const git_oid *old_id, const char *old_target);
 
 	/**
 	 * Suggests that the given refdb compress or optimize its references.
-	 *
-	 * This mechanism is implementation specific. For on-disk reference
-	 * databases, this may pack all loose references.
-	 *
-	 * A refdb implementation may provide this function; if it is not
-	 * provided, nothing will be done.
+	 * This mechanism is implementation specific.  (For on-disk reference
+	 * databases, this may pack all loose references.)    A refdb
+	 * implementation may provide this function; if it is not provided,
+	 * nothing will be done.
 	 */
 	int GIT_CALLBACK(compress)(git_refdb_backend *backend);
 
 	/**
 	 * Query whether a particular reference has a log (may be empty)
-	 *
-	 * A refdb implementation must provide this function.
 	 */
 	int GIT_CALLBACK(has_log)(git_refdb_backend *backend, const char *refname);
 
 	/**
 	 * Make sure a particular reference will have a reflog which
 	 * will be appended to on writes.
-	 *
-	 * A refdb implementation must provide this function.
 	 */
 	int GIT_CALLBACK(ensure_log)(git_refdb_backend *backend, const char *refname);
 
 	/**
 	 * Frees any resources held by the refdb (including the `git_refdb_backend`
-	 * itself).
-	 *
-	 * A refdb backend implementation must provide this function.
+	 * itself). A refdb backend implementation must provide this function.
 	 */
 	void GIT_CALLBACK(free)(git_refdb_backend *backend);
 
 	/**
 	 * Read the reflog for the given reference name.
-	 *
-	 * A refdb implementation must provide this function.
 	 */
 	int GIT_CALLBACK(reflog_read)(git_reflog **out, git_refdb_backend *backend, const char *name);
 
 	/**
 	 * Write a reflog to disk.
-	 *
-	 * A refdb implementation must provide this function.
 	 */
 	int GIT_CALLBACK(reflog_write)(git_refdb_backend *backend, git_reflog *reflog);
 
 	/**
-	 * Rename a reflog.
-	 *
-	 * A refdb implementation must provide this function.
+	 * Rename a reflog
 	 */
 	int GIT_CALLBACK(reflog_rename)(git_refdb_backend *_backend, const char *old_name, const char *new_name);
 
 	/**
 	 * Remove a reflog.
-	 *
-	 * A refdb implementation must provide this function.
 	 */
 	int GIT_CALLBACK(reflog_delete)(git_refdb_backend *backend, const char *name);
 
 	/**
-	 * Lock a reference.
-	 *
-	 * The opaque parameter will be passed to the unlock function.
-	 *
-	 * A refdb implementation may provide this function; if it is not
-	 * provided, the transaction API will fail to work.
+	 * Lock a reference. The opaque parameter will be passed to the unlock function
 	 */
 	int GIT_CALLBACK(lock)(void **payload_out, git_refdb_backend *backend, const char *refname);
 
 	/**
-	 * Unlock a reference.
-	 *
-	 * Only one of target or symbolic_target will be set.
-	 * `success` will be true if the reference should be update, false if
-	 * the lock must be discarded.
-	 *
-	 * A refdb implementation must provide this function if a `lock`
-	 * implementation is provided.
+	 * Unlock a reference. Only one of target or symbolic_target
+	 * will be set. success indicates whether to update the
+	 * reference or discard the lock (if it's false)
 	 */
 	int GIT_CALLBACK(unlock)(git_refdb_backend *backend, void *payload, int success, int update_reflog,
 		      const git_reference *ref, const git_signature *sig, const char *message);