rugged 0.27.10 → 0.27.10.1

data/vendor/libgit2/deps/zlib/CMakeLists.txt

@@ -1,4 +1,3 @@
-DISABLE_WARNINGS(implicit-fallthrough)
 ADD_DEFINITIONS(-DNO_VIZ -DSTDC -DNO_GZIP)
 FILE(GLOB SRC_ZLIB "*.c" "*.h")
 INCLUDE_DIRECTORIES(".")

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

@@ -9,21 +9,17 @@
 #define INCLUDE_git_git_h__
 
 #include "git2/annotated_commit.h"
-#include "git2/apply.h"
 #include "git2/attr.h"
 #include "git2/blob.h"
 #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"
 #include "git2/errors.h"
@@ -33,7 +29,6 @@
 #include "git2/ignore.h"
 #include "git2/index.h"
 #include "git2/indexer.h"
-#include "git2/mailmap.h"
 #include "git2/merge.h"
 #include "git2/message.h"
 #include "git2/net.h"

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

@@ -103,15 +103,6 @@ GIT_EXTERN(int) git_annotated_commit_from_revspec(
 GIT_EXTERN(const git_oid *) git_annotated_commit_id(
 	const git_annotated_commit *commit);
 
-/**
- * Get the refname that the given `git_annotated_commit` refers to.
- *
- * @param commit the given annotated commit
- * @return ref name.
- */
-GIT_EXTERN(const char *) git_annotated_commit_ref(
-	const git_annotated_commit *commit);
-
 /**
  * Frees a `git_annotated_commit`.
  *

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.
@@ -193,23 +186,7 @@ GIT_EXTERN(int) git_attr_get_many(
 	size_t num_attr,
 	const char **names);
 
-/**
- * The callback used with git_attr_foreach.
- *
- * This callback will be invoked only once per attribute name, even if there
- * are multiple rules for a given file. The highest priority rule will be
- * used.
- *
- * @see git_attr_foreach.
- *
- * @param name The attribute name.
- * @param value The attribute value. May be NULL if the attribute is explicitly
- *              set to UNSPECIFIED using the '!' sign.
- * @param payload A user-specified pointer.
- * @return 0 to continue looping, non-zero to stop. This value will be returned
- *         from git_attr_foreach.
- */
-typedef int GIT_CALLBACK(git_attr_foreach_cb)(const char *name, const char *value, void *payload);
+typedef int (*git_attr_foreach_cb)(const char *name, const char *value, void *payload);
 
 /**
  * Loop over all the git attributes for a path.
@@ -219,8 +196,13 @@ typedef int GIT_CALLBACK(git_attr_foreach_cb)(const char *name, const char *valu
  * @param path Path inside the repo to check attributes.  This does not have
  *             to exist, but if it does not, then it will be treated as a
  *             plain file (i.e. not a directory).
- * @param callback Function to invoke on each attribute name and value.
- *                 See git_attr_foreach_cb.
+ * @param callback Function to invoke on each attribute name and value.  The
+ *             value may be NULL is the attribute is explicitly set to
+ *             UNSPECIFIED using the '!' sign.  Callback will be invoked
+ *             only once per attribute name, even if there are multiple
+ *             rules for a given file.  The highest priority rule will be
+ *             used.  Return a non-zero value from this to stop looping.
+ *             The value will be returned from `git_attr_foreach`.
  * @param payload Passed on as extra parameter to callback function.
  * @return 0 on success, non-zero callback return value, or error code
  */

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

@@ -43,47 +43,38 @@ typedef enum {
 	/** Restrict the search of commits to those reachable following only the
 	 * first parents. */
 	GIT_BLAME_FIRST_PARENT = (1<<4),
-	/** Use mailmap file to map author and committer names and email addresses
-	 * to canonical real names and email addresses. The mailmap will be read
-	 * from the working directory, or HEAD in a bare repository. */
-	GIT_BLAME_USE_MAILMAP = (1<<5),
 } git_blame_flag_t;
 
 /**
  * Blame options structure
  *
- * Initialize with `GIT_BLAME_OPTIONS_INIT`. Alternatively, you can
- * use `git_blame_options_init`.
+ * Use zeros to indicate default settings.  It's easiest to use the
+ * `GIT_BLAME_OPTIONS_INIT` macro:
+ *     git_blame_options opts = GIT_BLAME_OPTIONS_INIT;
  *
+ * - `flags` is a combination of the `git_blame_flag_t` values above.
+ * - `min_match_characters` is the lower bound on the number of alphanumeric
+ *   characters that must be detected as moving/copying within a file for it to
+ *   associate those lines with the parent commit. The default value is 20.
+ *   This value only takes effect if any of the `GIT_BLAME_TRACK_COPIES_*`
+ *   flags are specified.
+ * - `newest_commit` is the id of the newest commit to consider.  The default
+ *                   is HEAD.
+ * - `oldest_commit` is the id of the oldest commit to consider.  The default
+ *                   is the first commit encountered with a NULL parent.
+ *	- `min_line` is the first line in the file to blame.  The default is 1 (line
+ *	             numbers start with 1).
+ *	- `max_line` is the last line in the file to blame.  The default is the last
+ *	             line of the file.
  */
 typedef struct git_blame_options {
 	unsigned int version;
 
-	/** A combination of `git_blame_flag_t` */
 	uint32_t flags;
-	/** The lower bound on the number of alphanumeric
-	 *   characters that must be detected as moving/copying within a file for it to
-	 *   associate those lines with the parent commit. The default value is 20.
-	 *   This value only takes effect if any of the `GIT_BLAME_TRACK_COPIES_*`
-	 *   flags are specified.
-	 */
 	uint16_t min_match_characters;
-	/** The id of the newest commit to consider. The default is HEAD. */
 	git_oid newest_commit;
-	/**
-	 * The id of the oldest commit to consider.
-	 * The default is the first commit encountered with a NULL parent.
-	 */
 	git_oid oldest_commit;
-	/**
-	 * The first line in the file to blame.
-	 * The default is 1 (line numbers start with 1).
-	 */
 	size_t min_line;
-	/**
-	 * The last line in the file to blame.
-	 * The default is the last line of the file.
-	 */
 	size_t max_line;
 } git_blame_options;
 
@@ -91,16 +82,14 @@ typedef struct git_blame_options {
 #define GIT_BLAME_OPTIONS_INIT {GIT_BLAME_OPTIONS_VERSION}
 
 /**
- * Initialize git_blame_options structure
+ * Initializes a `git_blame_options` with default values. Equivalent to
+ * creating an instance with GIT_BLAME_OPTIONS_INIT.
  *
- * Initializes a `git_blame_options` with default values. Equivalent to creating
- * an instance with GIT_BLAME_OPTIONS_INIT.
- *
- * @param opts The `git_blame_options` struct to initialize.
- * @param version The struct version; pass `GIT_BLAME_OPTIONS_VERSION`.
+ * @param opts The `git_blame_options` struct to initialize
+ * @param version Version of struct; 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);
 
@@ -112,9 +101,6 @@ GIT_EXTERN(int) git_blame_options_init(
  *   changed.
  * - `final_start_line_number` is the 1-based line number where this hunk
  *   begins, in the final version of the file
- * - `final_signature` is the author of `final_commit_id`. If
- *   `GIT_BLAME_USE_MAILMAP` has been specified, it will contain the canonical
- *    real name and email address.
  * - `orig_commit_id` is the OID of the commit where this hunk was found.  This
  *   will usually be the same as `final_commit_id`, except when
  *   `GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES` has been specified.
@@ -123,9 +109,6 @@ GIT_EXTERN(int) git_blame_options_init(
  * - `orig_start_line_number` is the 1-based line number where this hunk begins
  *   in the file named by `orig_path` in the commit specified by
  *   `orig_commit_id`.
- * - `orig_signature` is the author of `orig_commit_id`. If
- *   `GIT_BLAME_USE_MAILMAP` has been specified, it will contain the canonical
- *    real name and email address.
  * - `boundary` is 1 iff the hunk has been tracked to a boundary commit (the
  *   root, or the commit specified in git_blame_options.oldest_commit)
  */
@@ -145,7 +128,7 @@ typedef struct git_blame_hunk {
 } git_blame_hunk;
 
 
-/** Opaque structure to hold blame results */
+/* Opaque structure to hold blame results */
 typedef struct git_blame git_blame;
 
 /**
@@ -183,7 +166,7 @@ GIT_EXTERN(const git_blame_hunk*) git_blame_get_hunk_byline(
  * @param path path to file to consider
  * @param options options for the blame operation.  If NULL, this is treated as
  *                though GIT_BLAME_OPTIONS_INIT were passed.
- * @return 0 on success, or an error code. (use git_error_last for information
+ * @return 0 on success, or an error code. (use giterr_last for information
  *         about the error.)
  */
 GIT_EXTERN(int) git_blame_file(
@@ -207,7 +190,7 @@ GIT_EXTERN(int) git_blame_file(
  *                  from git_blame_file)
  * @param buffer the (possibly) modified contents of the file
  * @param buffer_len number of valid bytes in the buffer
- * @return 0 on success, or an error code. (use git_error_last for information
+ * @return 0 on success, or an error code. (use giterr_last for information
  *         about the error)
  */
 GIT_EXTERN(int) git_blame_buffer(

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.
@@ -138,7 +105,7 @@ typedef struct {
  * attributes set for the blob and the content detected in it.
  *
  * The output is written into a `git_buf` which the caller must free
- * when done (via `git_buf_dispose`).
+ * when done (via `git_buf_free`).
  *
  * If no filters need to be applied, then the `out` buffer will just
  * be populated with a pointer to the raw content of the blob.  In
@@ -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);
 
 /**