rugged 0.28.4 → 0.28.4.1

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

@@ -46,7 +46,7 @@ typedef struct {
  * @param version The struct version; pass `GIT_CHERRYPICK_OPTIONS_VERSION`.
  * @return Zero on success; -1 on failure.
  */
-GIT_EXTERN(int) git_cherrypick_options_init(
+GIT_EXTERN(int) git_cherrypick_init_options(
 	git_cherrypick_options *opts,
 	unsigned int version);
 
@@ -59,8 +59,8 @@ GIT_EXTERN(int) git_cherrypick_options_init(
  * @param out pointer to store the index result in
  * @param repo the repository that contains the given commits
  * @param cherrypick_commit the commit to cherry-pick
- * @param our_commit the commit to cherry-pick against (eg, HEAD)
- * @param mainline the parent of the `cherrypick_commit`, if it is a merge
+ * @param our_commit the commit to revert against (eg, HEAD)
+ * @param mainline the parent of the revert commit, if it is a merge
  * @param merge_options the merge options (or null for defaults)
  * @return zero on success, -1 on failure.
  */

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

@@ -97,7 +97,7 @@ typedef int GIT_CALLBACK(git_repository_create_cb)(
  * Clone options structure
  *
  * Initialize with `GIT_CLONE_OPTIONS_INIT`. Alternatively, you can
- * use `git_clone_options_init`.
+ * use `git_clone_init_options`.
  *
  */
 typedef struct git_clone_options {
@@ -178,7 +178,7 @@ typedef struct git_clone_options {
  * @param version The struct version; pass `GIT_CLONE_OPTIONS_VERSION`.
  * @return Zero on success; -1 on failure.
  */
-GIT_EXTERN(int) git_clone_options_init(
+GIT_EXTERN(int) git_clone_init_options(
 	git_clone_options *opts,
 	unsigned int version);
 

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

@@ -480,8 +480,7 @@ GIT_EXTERN(int) git_commit_create_buffer(
  *
  * @param out the resulting commit id
  * @param commit_content the content of the unsigned commit object
- * @param signature the signature to add to the commit. Leave `NULL`
- * to create a commit without adding a signature field.
+ * @param signature the signature to add to the commit
  * @param signature_field which header field should contain this
  * signature. Leave `NULL` for the default of "gpgsig"
  * @return 0 or an error code
@@ -502,27 +501,6 @@ GIT_EXTERN(int) git_commit_create_with_signature(
  */
 GIT_EXTERN(int) git_commit_dup(git_commit **out, git_commit *source);
 
-/**
- * Commit signing callback.
- *
- * The callback will be called with the commit content, giving a user an
- * opportunity to sign the commit content. The signature_field
- * buf may be left empty to specify the default field "gpgsig".
- *
- * Signatures can take the form of any string, and can be created on an arbitrary
- * header field. Signatures are most commonly used for verifying authorship of a
- * commit using GPG or a similar cryptographically secure signing algorithm.
- * See https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work for more
- * details.
- *
- * When the callback:
- * - returns GIT_PASSTHROUGH, no signature will be added to the commit.
- * - returns < 0, commit creation will be aborted.
- * - returns GIT_OK, the signature parameter is expected to be filled.
- */
-typedef int (*git_commit_signing_cb)(
-	git_buf *signature, git_buf *signature_field, const char *commit_content, void *payload);
-
 /** @} */
 GIT_END_DECL
 #endif

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

@@ -21,7 +21,10 @@
 #endif
 
 #if defined(_MSC_VER) && _MSC_VER < 1800
-# include <stdint.h>
+ GIT_BEGIN_DECL
+# include "inttypes.h"
+ GIT_END_DECL
+/** This check is needed for importing this file in an iOS/OS X framework throws an error in Xcode otherwise.*/
 #elif !defined(__CLANG_INTTYPES_H)
 # include <inttypes.h>
 #endif
@@ -202,8 +205,7 @@ typedef enum {
 	GIT_OPT_SET_ALLOCATOR,
 	GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY,
 	GIT_OPT_GET_PACK_MAX_OBJECTS,
-	GIT_OPT_SET_PACK_MAX_OBJECTS,
-	GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS
+	GIT_OPT_SET_PACK_MAX_OBJECTS
 } git_libgit2_opt_t;
 
 /**
@@ -393,10 +395,6 @@ typedef enum {
  *		> Set the maximum number of objects libgit2 will allow in a pack
  *		> file when downloading a pack file from a remote.
  *
- *	 opts(GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS, int enabled)
- *		> This will cause .keep file existence checks to be skipped when
- *		> accessing packfiles, which can help performance with remote filesystems.
- *
  * @param option Option key
  * @param ... value to set the option
  * @return 0 on success, <0 on failure

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

@@ -92,20 +92,20 @@ typedef struct git_config_iterator git_config_iterator;
  * Config var type
  */
 typedef enum {
-	GIT_CONFIGMAP_FALSE = 0,
-	GIT_CONFIGMAP_TRUE = 1,
-	GIT_CONFIGMAP_INT32,
-	GIT_CONFIGMAP_STRING
-} git_configmap_t;
+	GIT_CVAR_FALSE = 0,
+	GIT_CVAR_TRUE = 1,
+	GIT_CVAR_INT32,
+	GIT_CVAR_STRING
+} git_cvar_t;
 
 /**
  * Mapping from config variables to values.
  */
 typedef struct {
-	git_configmap_t type;
+	git_cvar_t cvar_type;
 	const char *str_match;
 	int map_value;
-} git_configmap;
+} git_cvar_map;
 
 /**
  * Locate the path to the global configuration file
@@ -623,7 +623,7 @@ GIT_EXTERN(int) git_config_foreach_match(
  *
  * A mapping array looks as follows:
  *
- *	git_configmap autocrlf_mapping[] = {
+ *	git_cvar_map autocrlf_mapping[] = {
  *		{GIT_CVAR_FALSE, NULL, GIT_AUTO_CRLF_FALSE},
  *		{GIT_CVAR_TRUE, NULL, GIT_AUTO_CRLF_TRUE},
  *		{GIT_CVAR_STRING, "input", GIT_AUTO_CRLF_INPUT},
@@ -644,7 +644,7 @@ GIT_EXTERN(int) git_config_foreach_match(
  * @param out place to store the result of the mapping
  * @param cfg config file to get the variables from
  * @param name name of the config variable to lookup
- * @param maps array of `git_configmap` objects specifying the possible mappings
+ * @param maps array of `git_cvar_map` objects specifying the possible mappings
  * @param map_n number of mapping objects in `maps`
  * @return 0 on success, error code otherwise
  */
@@ -652,20 +652,20 @@ GIT_EXTERN(int) git_config_get_mapped(
 	int *out,
 	const git_config *cfg,
 	const char *name,
-	const git_configmap *maps,
+	const git_cvar_map *maps,
 	size_t map_n);
 
 /**
  * Maps a string value to an integer constant
  *
  * @param out place to store the result of the parsing
- * @param maps array of `git_configmap` objects specifying the possible mappings
+ * @param maps array of `git_cvar_map` objects specifying the possible mappings
  * @param map_n number of mapping objects in `maps`
  * @param value value to parse
  */
 GIT_EXTERN(int) git_config_lookup_map_value(
 	int *out,
-	const git_configmap *maps,
+	const git_cvar_map *maps,
 	size_t map_n,
 	const char *value);
 

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

@@ -7,32 +7,12 @@
 #ifndef INCLUDE_git_deprecated_h__
 #define INCLUDE_git_deprecated_h__
 
-#include "attr.h"
-#include "config.h"
 #include "common.h"
-#include "blame.h"
 #include "buffer.h"
-#include "checkout.h"
-#include "cherrypick.h"
-#include "clone.h"
-#include "describe.h"
-#include "diff.h"
 #include "errors.h"
 #include "index.h"
-#include "indexer.h"
-#include "merge.h"
 #include "object.h"
-#include "proxy.h"
 #include "refs.h"
-#include "rebase.h"
-#include "remote.h"
-#include "trace.h"
-#include "repository.h"
-#include "revert.h"
-#include "stash.h"
-#include "status.h"
-#include "submodule.h"
-#include "worktree.h"
 
 /*
  * Users can avoid deprecated functions by defining `GIT_DEPRECATE_HARD`.
@@ -47,61 +27,6 @@
  */
 GIT_BEGIN_DECL
 
-/** @name Deprecated Attribute Constants
- *
- * These enumeration values are retained for backward compatibility.
- * The newer versions of these functions should be preferred in all
- * new code.
- *
- * There is no plan to remove these backward compatibility values at
- * this time.
- */
-/**@{*/
-
-#define GIT_ATTR_UNSPECIFIED_T GIT_ATTR_VALUE_UNSPECIFIED
-#define GIT_ATTR_TRUE_T GIT_ATTR_VALUE_TRUE
-#define GIT_ATTR_FALSE_T GIT_ATTR_VALUE_FALSE
-#define GIT_ATTR_VALUE_T GIT_ATTR_VALUE_STRING
-
-#define GIT_ATTR_TRUE(attr) GIT_ATTR_IS_TRUE(attr)
-#define GIT_ATTR_FALSE(attr) GIT_ATTR_IS_FALSE(attr)
-#define GIT_ATTR_UNSPECIFIED(attr) GIT_ATTR_IS_UNSPECIFIED(attr)
-
-typedef git_attr_value_t git_attr_t;
-
-/**@}*/
-
-/** @name Deprecated Blob Functions
- *
- * These functions are retained for backward compatibility.  The newer
- * versions of these functions should be preferred in all new code.
- *
- * There is no plan to remove these backward compatibility values at
- * this time.
- */
-/**@{*/
-
-GIT_EXTERN(int) git_blob_create_fromworkdir(git_oid *id, git_repository *repo, const char *relative_path);
-GIT_EXTERN(int) git_blob_create_fromdisk(git_oid *id, git_repository *repo, const char *path);
-GIT_EXTERN(int) git_blob_create_fromstream(
-	git_writestream **out,
-	git_repository *repo,
-	const char *hintpath);
-GIT_EXTERN(int) git_blob_create_fromstream_commit(
-	git_oid *out,
-	git_writestream *stream);
-GIT_EXTERN(int) git_blob_create_frombuffer(
-	git_oid *id, git_repository *repo, const void *buffer, size_t len);
-
-/** Deprecated in favor of @see git_blob_filter */
-GIT_EXTERN(int) git_blob_filtered_content(
-	git_buf *out,
-	git_blob *blob,
-	const char *as_path,
-	int check_for_binary_data);
-
-/**@}*/
-
 /** @name Deprecated Buffer Functions
  *
  * These functions and enumeration values are retained for backward
@@ -127,19 +52,6 @@ GIT_EXTERN(void) git_buf_free(git_buf *buffer);
 
 /**@}*/
 
-/** @name Deprecated Config Functions and Constants
- */
-/**@{*/
-
-#define GIT_CVAR_FALSE  GIT_CONFIGMAP_FALSE
-#define GIT_CVAR_TRUE   GIT_CONFIGMAP_TRUE
-#define GIT_CVAR_INT32  GIT_CONFIGMAP_INT32
-#define GIT_CVAR_STRING GIT_CONFIGMAP_STRING
-
-typedef git_configmap git_cvar_map;
-
-/**@}*/
-
 /** @name Deprecated Error Functions and Constants
  *
  * These functions and enumeration values are retained for backward
@@ -237,11 +149,10 @@ GIT_EXTERN(void) giterr_set_oom(void);
 
 /**@}*/
 
-/** @name Deprecated Index Functions and Constants
+/** @name Deprecated Index Constants
  *
- * These functions and enumeration values are retained for backward
- * compatibility.  The newer versions of these values should be
- * preferred in all new code.
+ * These enumeration values are retained for backward compatibility.
+ * The newer versions of these values should be preferred in all new code.
  *
  * There is no plan to remove these backward compatibility values at
  * this time.
@@ -281,11 +192,6 @@ GIT_EXTERN(void) giterr_set_oom(void);
 #define GIT_INDEXCAP_NO_SYMLINKS       GIT_INDEX_CAPABILITY_NO_SYMLINKS
 #define GIT_INDEXCAP_FROM_OWNER        GIT_INDEX_CAPABILITY_FROM_OWNER
 
-GIT_EXTERN(int) git_index_add_frombuffer(
-	git_index *index,
-	const git_index_entry *entry,
-	const void *buffer, size_t len);
-
 /**@}*/
 
 /** @name Deprecated Object Constants
@@ -311,20 +217,6 @@ GIT_EXTERN(int) git_index_add_frombuffer(
 #define GIT_OBJ_OFS_DELTA GIT_OBJECT_OFS_DELTA
 #define GIT_OBJ_REF_DELTA GIT_OBJECT_REF_DELTA
 
-/**
- * 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);
-
 /**@}*/
 
 /** @name Deprecated Reference Constants
@@ -351,138 +243,6 @@ GIT_EXTERN(size_t) git_object__size(git_object_t type);
 #define GIT_REF_FORMAT_REFSPEC_PATTERN GIT_REFERENCE_FORMAT_REFSPEC_PATTERN
 #define GIT_REF_FORMAT_REFSPEC_SHORTHAND GIT_REFERENCE_FORMAT_REFSPEC_SHORTHAND
 
-GIT_EXTERN(int) git_tag_create_frombuffer(
-	git_oid *oid,
-	git_repository *repo,
-	const char *buffer,
-	int force);
-
-/**@}*/
-
-/** @name Deprecated Credential Callback Types
- *
- * These types are retained for backward compatibility.  The newer
- * versions of these values should be preferred in all new code.
- *
- * There is no plan to remove these backward compatibility values at
- * this time.
- */
-
-typedef git_cred_sign_cb git_cred_sign_callback;
-typedef git_cred_ssh_interactive_cb git_cred_ssh_interactive_callback;
-
-/**@}*/
-
-/** @name Deprecated Trace Callback Types
- *
- * These types are retained for backward compatibility.  The newer
- * versions of these values should be preferred in all new code.
- *
- * There is no plan to remove these backward compatibility values at
- * this time.
- */
-/**@{*/
-
-typedef git_trace_cb git_trace_callback;
-
-/**@}*/
-
-/** @name Deprecated Object ID Types
- *
- * These types are retained for backward compatibility.  The newer
- * versions of these values should be preferred in all new code.
- *
- * There is no plan to remove these backward compatibility values at
- * this time.
- */
-/**@{*/
-
-GIT_EXTERN(int) git_oid_iszero(const git_oid *id);
-
-/**@}*/
-
-/** @name Deprecated Transfer Progress Types
- *
- * These types are retained for backward compatibility.  The newer
- * versions of these values should be preferred in all new code.
- *
- * There is no plan to remove these backward compatibility values at
- * this time.
- */
-/**@{*/
-
-/**
- * This structure is used to provide callers information about the
- * progress of indexing a packfile.
- *
- * This type is deprecated, but there is no plan to remove this
- * type definition at this time.
- */
-typedef git_indexer_progress git_transfer_progress;
-
-/**
- * Type definition for progress callbacks during indexing.
- *
- * This type is deprecated, but there is no plan to remove this
- * type definition at this time.
- */
-typedef git_indexer_progress_cb git_transfer_progress_cb;
-
-/**
- * Type definition for push transfer progress callbacks.
- *
- * This type is deprecated, but there is no plan to remove this
- * type definition at this time.
- */
-typedef git_push_transfer_progress_cb git_push_transfer_progress;
-
- /** The type of a remote completion event */
-#define git_remote_completion_type git_remote_completion_t
-
-/**
- * Callback for listing the remote heads
- */
-typedef int GIT_CALLBACK(git_headlist_cb)(git_remote_head *rhead, void *payload);
-
-/**@}*/
-
-/** @name Deprecated Options Initialization Functions
- *
- * These functions are retained for backward compatibility.  The newer
- * versions of these functions should be preferred in all new code.
- *
- * There is no plan to remove these backward compatibility functions at
- * this time.
- */
-/**@{*/
-
-GIT_EXTERN(int) git_blame_init_options(git_blame_options *opts, unsigned int version);
-GIT_EXTERN(int) git_checkout_init_options(git_checkout_options *opts, unsigned int version);
-GIT_EXTERN(int) git_cherrypick_init_options(git_cherrypick_options *opts, unsigned int version);
-GIT_EXTERN(int) git_clone_init_options(git_clone_options *opts, unsigned int version);
-GIT_EXTERN(int) git_describe_init_options(git_describe_options *opts, unsigned int version);
-GIT_EXTERN(int) git_describe_init_format_options(git_describe_format_options *opts, unsigned int version);
-GIT_EXTERN(int) git_diff_init_options(git_diff_options *opts, unsigned int version);
-GIT_EXTERN(int) git_diff_find_init_options(git_diff_find_options *opts, unsigned int version);
-GIT_EXTERN(int) git_diff_format_email_init_options(git_diff_format_email_options *opts, unsigned int version);
-GIT_EXTERN(int) git_diff_patchid_init_options(git_diff_patchid_options *opts, unsigned int version);
-GIT_EXTERN(int) git_fetch_init_options(git_fetch_options *opts, unsigned int version);
-GIT_EXTERN(int) git_indexer_init_options(git_indexer_options *opts, unsigned int version);
-GIT_EXTERN(int) git_merge_init_options(git_merge_options *opts, unsigned int version);
-GIT_EXTERN(int) git_merge_file_init_input(git_merge_file_input *input, unsigned int version);
-GIT_EXTERN(int) git_merge_file_init_options(git_merge_file_options *opts, unsigned int version);
-GIT_EXTERN(int) git_proxy_init_options(git_proxy_options *opts, unsigned int version);
-GIT_EXTERN(int) git_push_init_options(git_push_options *opts, unsigned int version);
-GIT_EXTERN(int) git_rebase_init_options(git_rebase_options *opts, unsigned int version);
-GIT_EXTERN(int) git_remote_create_init_options(git_remote_create_options *opts, unsigned int version);
-GIT_EXTERN(int) git_repository_init_init_options(git_repository_init_options *opts, unsigned int version);
-GIT_EXTERN(int) git_revert_init_options(git_revert_options *opts, unsigned int version);
-GIT_EXTERN(int) git_stash_apply_init_options(git_stash_apply_options *opts, unsigned int version);
-GIT_EXTERN(int) git_status_init_options(git_status_options *opts, unsigned int version);
-GIT_EXTERN(int) git_submodule_update_init_options(git_submodule_update_options *opts, unsigned int version);
-GIT_EXTERN(int) git_worktree_add_init_options(git_worktree_add_options *opts, unsigned int version);
-GIT_EXTERN(int) git_worktree_prune_init_options(git_worktree_prune_options *opts, unsigned int version);
-
 /**@}*/
 
 /** @} */