rugged 0.28.4 → 0.28.4.1

data/vendor/libgit2/deps/zlib/adler32.c

@@ -177,3 +177,10 @@ uLong ZEXPORT adler32_combine(adler1, adler2, len2)
     return adler32_combine_(adler1, adler2, len2);
 }
 
+uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off64_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}

data/vendor/libgit2/deps/zlib/crc32.c

@@ -433,3 +433,10 @@ uLong ZEXPORT crc32_combine(crc1, crc2, len2)
     return crc32_combine_(crc1, crc2, len2);
 }
 
+uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off64_t len2;
+{
+    return crc32_combine_(crc1, crc2, len2);
+}

data/vendor/libgit2/include/git2.h

@@ -15,14 +15,12 @@
 #include "git2/blame.h"
 #include "git2/branch.h"
 #include "git2/buffer.h"
-#include "git2/cert.h"
 #include "git2/checkout.h"
 #include "git2/cherrypick.h"
 #include "git2/clone.h"
 #include "git2/commit.h"
 #include "git2/common.h"
 #include "git2/config.h"
-#include "git2/cred.h"
 #include "git2/deprecated.h"
 #include "git2/describe.h"
 #include "git2/diff.h"

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

@@ -53,44 +53,25 @@ typedef int GIT_CALLBACK(git_apply_hunk_cb)(
 	const git_diff_hunk *hunk,
 	void *payload);
 
-/** Flags controlling the behavior of git_apply */
-typedef enum {
-	/**
-	 * Don't actually make changes, just test that the patch applies.
-	 * This is the equivalent of `git apply --check`.
-	 */
-	GIT_APPLY_CHECK = (1 << 0),
-} git_apply_flags_t;
-
 /**
  * Apply options structure
  *
  * Initialize with `GIT_APPLY_OPTIONS_INIT`. Alternatively, you can
- * use `git_apply_options_init`.
+ * use `git_apply_init_options`.
  *
  * @see git_apply_to_tree, git_apply
  */
 typedef struct {
-	unsigned int version; /**< The version */
+	unsigned int version;
 
-	/** When applying a patch, callback that will be made per delta (file). */
 	git_apply_delta_cb delta_cb;
-
-	/** When applying a patch, callback that will be made per hunk. */
 	git_apply_hunk_cb hunk_cb;
-
-	/** Payload passed to both delta_cb & hunk_cb. */
 	void *payload;
-
-	/** Bitmask of git_apply_flags_t */
-	unsigned int flags;
 } git_apply_options;
 
 #define GIT_APPLY_OPTIONS_VERSION 1
 #define GIT_APPLY_OPTIONS_INIT {GIT_APPLY_OPTIONS_VERSION}
 
-GIT_EXTERN(int) git_apply_options_init(git_apply_options *opts, unsigned int version);
-
 /**
  * Apply a `git_diff` to a `git_tree`, and return the resulting image
  * as an index.
@@ -108,7 +89,6 @@ GIT_EXTERN(int) git_apply_to_tree(
 	git_diff *diff,
 	const git_apply_options *options);
 
-/** Possible application locations for git_apply */
 typedef enum {
 	/**
 	 * Apply the patch to the workdir, leaving the index untouched.

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

@@ -30,7 +30,7 @@ GIT_BEGIN_DECL
  * Then for file `xyz.c` looking up attribute "foo" gives a value for
  * which `GIT_ATTR_TRUE(value)` is true.
  */
-#define GIT_ATTR_IS_TRUE(attr)	(git_attr_value(attr) == GIT_ATTR_VALUE_TRUE)
+#define GIT_ATTR_TRUE(attr)	(git_attr_value(attr) == GIT_ATTR_TRUE_T)
 
 /**
  * GIT_ATTR_FALSE checks if an attribute is set off.  In core git
@@ -44,7 +44,7 @@ GIT_BEGIN_DECL
  * Then for file `zyx.h` looking up attribute "foo" gives a value for
  * which `GIT_ATTR_FALSE(value)` is true.
  */
-#define GIT_ATTR_IS_FALSE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_FALSE)
+#define GIT_ATTR_FALSE(attr) (git_attr_value(attr) == GIT_ATTR_FALSE_T)
 
 /**
  * GIT_ATTR_UNSPECIFIED checks if an attribute is unspecified.  This
@@ -62,7 +62,7 @@ GIT_BEGIN_DECL
  * file `onefile.rb` or looking up "bar" on any file will all give
  * `GIT_ATTR_UNSPECIFIED(value)` of true.
  */
-#define GIT_ATTR_IS_UNSPECIFIED(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_UNSPECIFIED)
+#define GIT_ATTR_UNSPECIFIED(attr) (git_attr_value(attr) == GIT_ATTR_UNSPECIFIED_T)
 
 /**
  * GIT_ATTR_HAS_VALUE checks if an attribute is set to a value (as
@@ -74,17 +74,17 @@ GIT_BEGIN_DECL
  * Given this, looking up "eol" for `onefile.txt` will give back the
  * string "lf" and `GIT_ATTR_SET_TO_VALUE(attr)` will return true.
  */
-#define GIT_ATTR_HAS_VALUE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_STRING)
+#define GIT_ATTR_HAS_VALUE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_T)
 
 /**
  * Possible states for an attribute
  */
 typedef enum {
-	GIT_ATTR_VALUE_UNSPECIFIED = 0, /**< The attribute has been left unspecified */
-	GIT_ATTR_VALUE_TRUE,   /**< The attribute has been set */
-	GIT_ATTR_VALUE_FALSE,  /**< The attribute has been unset */
-	GIT_ATTR_VALUE_STRING, /**< This attribute has a value */
-} git_attr_value_t;
+	GIT_ATTR_UNSPECIFIED_T = 0, /**< The attribute has been left unspecified */
+	GIT_ATTR_TRUE_T,  /**< The attribute has been set */
+	GIT_ATTR_FALSE_T, /**< The attribute has been unset */
+	GIT_ATTR_VALUE_T, /**< This attribute has a value */
+} git_attr_t;
 
 /**
  * Return the value type for a given attribute.
@@ -99,7 +99,7 @@ typedef enum {
  * @param attr The attribute
  * @return the value type for the attribute
  */
-GIT_EXTERN(git_attr_value_t) git_attr_value(const char *attr);
+GIT_EXTERN(git_attr_t) git_attr_value(const char *attr);
 
 /**
  * Check attribute flags: Reading values from index and working directory.
@@ -119,20 +119,13 @@ GIT_EXTERN(git_attr_value_t) git_attr_value(const char *attr);
 #define GIT_ATTR_CHECK_INDEX_ONLY		2
 
 /**
- * Check attribute flags: controlling extended attribute behavior.
+ * Check attribute flags: Using the system attributes file.
  *
  * Normally, attribute checks include looking in the /etc (or system
  * equivalent) directory for a `gitattributes` file.  Passing this
  * flag will cause attribute checks to ignore that file.
- * equivalent) directory for a `gitattributes` file.  Passing the
- * `GIT_ATTR_CHECK_NO_SYSTEM` flag will cause attribute checks to
- * ignore that file.
- *
- * Passing the `GIT_ATTR_CHECK_INCLUDE_HEAD` flag will use attributes
- * from a `.gitattributes` file in the repository at the HEAD revision.
  */
-#define GIT_ATTR_CHECK_NO_SYSTEM        (1 << 2)
-#define GIT_ATTR_CHECK_INCLUDE_HEAD     (1 << 3)
+#define GIT_ATTR_CHECK_NO_SYSTEM		(1 << 2)
 
 /**
  * Look up the value of one git attribute for path.

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

@@ -53,7 +53,7 @@ typedef enum {
  * Blame options structure
  *
  * Initialize with `GIT_BLAME_OPTIONS_INIT`. Alternatively, you can
- * use `git_blame_options_init`.
+ * use `git_blame_init_options`.
  *
  */
 typedef struct git_blame_options {
@@ -100,7 +100,7 @@ typedef struct git_blame_options {
  * @param version The struct version; pass `GIT_BLAME_OPTIONS_VERSION`.
  * @return Zero on success; -1 on failure.
  */
-GIT_EXTERN(int) git_blame_options_init(
+GIT_EXTERN(int) git_blame_init_options(
 	git_blame_options *opts,
 	unsigned int version);
 

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

@@ -94,40 +94,7 @@ GIT_EXTERN(const void *) git_blob_rawcontent(const git_blob *blob);
  * @param blob pointer to the blob
  * @return size on bytes
  */
-GIT_EXTERN(git_object_size_t) git_blob_rawsize(const git_blob *blob);
-
-/**
- * Flags to control the functionality of `git_blob_filter`.
- */
-typedef enum {
-	/** When set, filters will not be applied to binary files. */
-	GIT_BLOB_FILTER_CHECK_FOR_BINARY = (1 << 0),
-
-	/**
-	 * When set, filters will not load configuration from the
-	 * system-wide `gitattributes` in `/etc` (or system equivalent).
-	 */
-	GIT_BLOB_FILTER_NO_SYSTEM_ATTRIBUTES = (1 << 1),
-
-	/**
-	 * When set, filters will be loaded from a `.gitattributes` file
-	 * in the HEAD commit.
-	 */
-	GIT_BLOB_FILTER_ATTTRIBUTES_FROM_HEAD = (1 << 2),
-} git_blob_filter_flag_t;
-
-/**
- * The options used when applying filter options to a file.
- */
-typedef struct {
-	int version;
-
-	/** Flags to control the filtering process, see `git_blob_filter_flag_t` above */
-	uint32_t flags;
-} git_blob_filter_options;
-
-#define GIT_BLOB_FILTER_OPTIONS_VERSION 1
-#define GIT_BLOB_FILTER_OPTIONS_INIT {GIT_BLOB_FILTER_OPTIONS_VERSION, GIT_BLOB_FILTER_CHECK_FOR_BINARY}
+GIT_EXTERN(git_off_t) git_blob_rawsize(const git_blob *blob);
 
 /**
  * Get a buffer with the filtered content of a blob.
@@ -148,14 +115,15 @@ typedef struct {
  * @param out The git_buf to be filled in
  * @param blob Pointer to the blob
  * @param as_path Path used for file attribute lookups, etc.
- * @param opts Options to use for filtering the blob
+ * @param check_for_binary_data Should this test if blob content contains
+ *        NUL bytes / looks like binary data before applying filters?
  * @return 0 on success or an error code
  */
-GIT_EXTERN(int) git_blob_filter(
+GIT_EXTERN(int) git_blob_filtered_content(
 	git_buf *out,
 	git_blob *blob,
 	const char *as_path,
-	git_blob_filter_options *opts);
+	int check_for_binary_data);
 
 /**
  * Read a file from the working folder of a repository
@@ -168,7 +136,7 @@ GIT_EXTERN(int) git_blob_filter(
  *	relative to the repository's working dir
  * @return 0 or an error code
  */
-GIT_EXTERN(int) git_blob_create_from_workdir(git_oid *id, git_repository *repo, const char *relative_path);
+GIT_EXTERN(int) git_blob_create_fromworkdir(git_oid *id, git_repository *repo, const char *relative_path);
 
 /**
  * Read a file from the filesystem and write its content
@@ -180,7 +148,7 @@ GIT_EXTERN(int) git_blob_create_from_workdir(git_oid *id, git_repository *repo,
  * @param path file from which the blob will be created
  * @return 0 or an error code
  */
-GIT_EXTERN(int) git_blob_create_from_disk(git_oid *id, git_repository *repo, const char *path);
+GIT_EXTERN(int) git_blob_create_fromdisk(git_oid *id, git_repository *repo, const char *path);
 
 /**
  * Create a stream to write a new blob into the object db
@@ -188,12 +156,12 @@ GIT_EXTERN(int) git_blob_create_from_disk(git_oid *id, git_repository *repo, con
  * This function may need to buffer the data on disk and will in
  * general not be the right choice if you know the size of the data
  * to write. If you have data in memory, use
- * `git_blob_create_from_buffer()`. If you do not, but know the size of
+ * `git_blob_create_frombuffer()`. If you do not, but know the size of
  * the contents (and don't want/need to perform filtering), use
  * `git_odb_open_wstream()`.
  *
  * Don't close this stream yourself but pass it to
- * `git_blob_create_from_stream_commit()` to commit the write to the
+ * `git_blob_create_fromstream_commit()` to commit the write to the
  * object db and get the object id.
  *
  * If the `hintpath` parameter is filled, it will be used to determine
@@ -207,7 +175,7 @@ GIT_EXTERN(int) git_blob_create_from_disk(git_oid *id, git_repository *repo, con
  *        to apply onto the content of the blob to be created.
  * @return 0 or error code
  */
-GIT_EXTERN(int) git_blob_create_from_stream(
+GIT_EXTERN(int) git_blob_create_fromstream(
 	git_writestream **out,
 	git_repository *repo,
 	const char *hintpath);
@@ -221,7 +189,7 @@ GIT_EXTERN(int) git_blob_create_from_stream(
  * @param stream the stream to close
  * @return 0 or an error code
  */
-GIT_EXTERN(int) git_blob_create_from_stream_commit(
+GIT_EXTERN(int) git_blob_create_fromstream_commit(
 	git_oid *out,
 	git_writestream *stream);
 
@@ -234,7 +202,7 @@ GIT_EXTERN(int) git_blob_create_from_stream_commit(
  * @param len length of the data
  * @return 0 or an error code
  */
-GIT_EXTERN(int) git_blob_create_from_buffer(
+GIT_EXTERN(int) git_blob_create_frombuffer(
 	git_oid *id, git_repository *repo, const void *buffer, size_t len);
 
 /**

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

@@ -32,32 +32,26 @@ GIT_BEGIN_DECL
  * a block of memory they hold.  In this case, libgit2 will not resize or
  * free the memory, but will read from it as needed.
  *
+ * A `git_buf` is a public structure with three fields:
+ *
+ * - `ptr` points to the start of the allocated memory.  If it is NULL,
+ *   then the `git_buf` is considered empty and libgit2 will feel free
+ *   to overwrite it with new data.
+ *
+ * - `size` holds the size (in bytes) of the data that is actually used.
+ *
+ * - `asize` holds the known total amount of allocated memory if the `ptr`
+ *    was allocated by libgit2.  It may be larger than `size`.  If `ptr`
+ *    was not allocated by libgit2 and should not be resized and/or freed,
+ *    then `asize` will be set to zero.
+ *
  * Some APIs may occasionally do something slightly unusual with a buffer,
  * such as setting `ptr` to a value that was passed in by the user.  In
  * those cases, the behavior will be clearly documented by the API.
  */
 typedef struct {
-	/**
-	 * The buffer contents.
-	 *
-	 * `ptr` points to the start of the allocated memory.  If it is NULL,
-	 * then the `git_buf` is considered empty and libgit2 will feel free
-	 * to overwrite it with new data.
-	 */
 	char   *ptr;
-
-	/**
-	 * `asize` holds the known total amount of allocated memory if the `ptr`
-	 *  was allocated by libgit2.  It may be larger than `size`.  If `ptr`
-	 *  was not allocated by libgit2 and should not be resized and/or freed,
-	 *  then `asize` will be set to zero.
-	 */
-	size_t asize;
-
-	/**
-	 * `size` holds the size (in bytes) of the data that is actually used.
-	 */
-	size_t size;
+	size_t asize, size;
 } git_buf;
 
 /**

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

@@ -106,22 +106,10 @@ GIT_BEGIN_DECL
 typedef enum {
 	GIT_CHECKOUT_NONE = 0, /**< default is a dry run, no actual updates */
 
-	/**
-	 * Allow safe updates that cannot overwrite uncommitted data.
-	 * If the uncommitted changes don't conflict with the checked out files,
-	 * the checkout will still proceed, leaving the changes intact.
-	 *
-	 * Mutually exclusive with GIT_CHECKOUT_FORCE.
-	 * GIT_CHECKOUT_FORCE takes precedence over GIT_CHECKOUT_SAFE.
-	 */
+	/** Allow safe updates that cannot overwrite uncommitted data */
 	GIT_CHECKOUT_SAFE = (1u << 0),
 
-	/**
-	 * Allow all updates to force working directory to look like index.
-	 *
-	 * Mutually exclusive with GIT_CHECKOUT_SAFE.
-	 * GIT_CHECKOUT_FORCE takes precedence over GIT_CHECKOUT_SAFE.
-	 */
+	/** Allow all updates to force working directory to look like index */
 	GIT_CHECKOUT_FORCE = (1u << 1),
 
 
@@ -225,7 +213,6 @@ typedef enum {
 	GIT_CHECKOUT_NOTIFY_ALL       = 0x0FFFFu
 } git_checkout_notify_t;
 
-/** Checkout performance-reporting structure */
 typedef struct {
 	size_t mkdir_calls;
 	size_t stat_calls;
@@ -257,11 +244,11 @@ typedef void GIT_CALLBACK(git_checkout_perfdata_cb)(
  * Checkout options structure
  *
  * Initialize with `GIT_CHECKOUT_OPTIONS_INIT`. Alternatively, you can
- * use `git_checkout_options_init`.
+ * use `git_checkout_init_options`.
  *
  */
 typedef struct git_checkout_options {
-	unsigned int version; /**< The version */
+	unsigned int version;
 
 	unsigned int checkout_strategy; /**< default will be a safe checkout */
 
@@ -271,46 +258,29 @@ typedef struct git_checkout_options {
 	int file_open_flags;    /**< default is O_CREAT | O_TRUNC | O_WRONLY */
 
 	unsigned int notify_flags; /**< see `git_checkout_notify_t` above */
-
-	/**
-	 * Optional callback to get notifications on specific file states.
-	 * @see git_checkout_notify_t
-	 */
 	git_checkout_notify_cb notify_cb;
-
-	/** Payload passed to notify_cb */
 	void *notify_payload;
 
 	/** Optional callback to notify the consumer of checkout progress. */
 	git_checkout_progress_cb progress_cb;
-
-	/** Payload passed to progress_cb */
 	void *progress_payload;
 
-	/**
-	 * A list of wildmatch patterns or paths.
-	 *
-	 * By default, all paths are processed. If you pass an array of wildmatch
-	 * patterns, those will be used to filter which paths should be taken into
-	 * account.
-	 *
-	 * Use GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH to treat as a simple list.
+	/** When not zeroed out, array of fnmatch patterns specifying which
+	 *  paths should be taken into account, otherwise all files.  Use
+	 *  GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH to treat as simple list.
 	 */
 	git_strarray paths;
 
-	/**
-	 * The expected content of the working directory; defaults to HEAD.
-	 *
-	 * If the working directory does not match this baseline information,
-	 * that will produce a checkout conflict.
+	/** The expected content of the working directory; defaults to HEAD.
+	 *  If the working directory does not match this baseline information,
+	 *  that will produce a checkout conflict.
 	 */
 	git_tree *baseline;
 
-	/**
-	 * Like `baseline` above, though expressed as an index.  This
-	 * option overrides `baseline`.
+	/** Like `baseline` above, though expressed as an index.  This
+	 *  option overrides `baseline`.
 	 */
-	git_index *baseline_index;
+	git_index *baseline_index; /**< expected content of workdir, expressed as an index. */
 
 	const char *target_directory; /**< alternative checkout path to workdir */
 
@@ -320,8 +290,6 @@ typedef struct git_checkout_options {
 
 	/** Optional callback to notify the consumer of performance data. */
 	git_checkout_perfdata_cb perfdata_cb;
-
-	/** Payload passed to perfdata_cb */
 	void *perfdata_payload;
 } git_checkout_options;
 
@@ -338,7 +306,7 @@ typedef struct git_checkout_options {
  * @param version The struct version; pass `GIT_CHECKOUT_OPTIONS_VERSION`.
  * @return Zero on success; -1 on failure.
  */
-GIT_EXTERN(int) git_checkout_options_init(
+GIT_EXTERN(int) git_checkout_init_options(
 	git_checkout_options *opts,
 	unsigned int version);