rugged 0.28.4 → 0.28.4.1

data/vendor/libgit2/src/clone.h

@@ -11,10 +11,6 @@
 
 #include "git2/clone.h"
 
-extern int git_clone__submodule(git_repository **out,
-	const char *url, const char *local_path,
-	const git_clone_options *_options);
-
 extern int git_clone__should_clone_local(const char *url, git_clone_local_t local);
 
 #endif

data/vendor/libgit2/src/commit.c

@@ -20,7 +20,6 @@
 #include "message.h"
 #include "refs.h"
 #include "object.h"
-#include "array.h"
 #include "oidarray.h"
 
 void git_commit__free(void *_commit)
@@ -81,8 +80,8 @@ on_error:
 }
 
 static int validate_tree_and_parents(git_array_oid_t *parents, git_repository *repo, const git_oid *tree,
-	git_commit_parent_callback parent_cb, void *parent_payload,
-	const git_oid *current_id, bool validate)
+				     git_commit_parent_callback parent_cb, void *parent_payload,
+				     const git_oid *current_id, bool validate)
 {
 	size_t i;
 	int error;
@@ -153,8 +152,8 @@ static int git_commit__create_internal(
 		goto cleanup;
 
 	error = git_commit__create_buffer_internal(&buf, author, committer,
-		message_encoding, message, tree,
-		&parents);
+						   message_encoding, message, tree,
+						   &parents);
 
 	if (error < 0)
 		goto cleanup;
@@ -384,16 +383,15 @@ int git_commit_amend(
 	return error;
 }
 
-static int commit_parse(git_commit *commit, const char *data, size_t size, unsigned int flags)
+int git_commit__parse_raw(void *_commit, const char *data, size_t size)
 {
+	git_commit *commit = _commit;
 	const char *buffer_start = data, *buffer;
 	const char *buffer_end = buffer_start + size;
 	git_oid parent_id;
 	size_t header_len;
 	git_signature dummy_sig;
 
-	assert(commit && data);
-
 	buffer = buffer_start;
 
 	/* Allocate for one, which will allow not to realloc 90% of the time  */
@@ -401,15 +399,8 @@ static int commit_parse(git_commit *commit, const char *data, size_t size, unsig
 	GIT_ERROR_CHECK_ARRAY(commit->parent_ids);
 
 	/* The tree is always the first field */
-	if (!(flags & GIT_COMMIT_PARSE_QUICK)) {
-	    if (git_oid__parse(&commit->tree_id, &buffer, buffer_end, "tree ") < 0)
-			goto bad_buffer;
-	} else {
-		size_t tree_len = strlen("tree ") + GIT_OID_HEXSZ + 1;
-		if (buffer + tree_len > buffer_end)
-			goto bad_buffer;
-		buffer += tree_len;
-	}
+	if (git_oid__parse(&commit->tree_id, &buffer, buffer_end, "tree ") < 0)
+		goto bad_buffer;
 
 	/*
 	 * TODO: commit grafts!
@@ -422,13 +413,11 @@ static int commit_parse(git_commit *commit, const char *data, size_t size, unsig
 		git_oid_cpy(new_id, &parent_id);
 	}
 
-	if (!(flags & GIT_COMMIT_PARSE_QUICK)) {
-		commit->author = git__malloc(sizeof(git_signature));
-		GIT_ERROR_CHECK_ALLOC(commit->author);
+	commit->author = git__malloc(sizeof(git_signature));
+	GIT_ERROR_CHECK_ALLOC(commit->author);
 
-		if (git_signature__parse(commit->author, &buffer, buffer_end, "author ", '\n') < 0)
-			return -1;
-	}
+	if (git_signature__parse(commit->author, &buffer, buffer_end, "author ", '\n') < 0)
+		return -1;
 
 	/* Some tools create multiple author fields, ignore the extra ones */
 	while (!git__prefixncmp(buffer, buffer_end - buffer, "author ")) {
@@ -446,9 +435,6 @@ static int commit_parse(git_commit *commit, const char *data, size_t size, unsig
 	if (git_signature__parse(commit->committer, &buffer, buffer_end, "committer ", '\n') < 0)
 		return -1;
 
-	if (flags & GIT_COMMIT_PARSE_QUICK)
-		return 0;
-
 	/* Parse add'l header entries */
 	while (buffer < buffer_end) {
 		const char *eoln = buffer;
@@ -491,19 +477,11 @@ bad_buffer:
 	return -1;
 }
 
-int git_commit__parse_raw(void *commit, const char *data, size_t size)
-{
-	return commit_parse(commit, data, size, 0);
-}
-
-int git_commit__parse_ext(git_commit *commit, git_odb_object *odb_obj, unsigned int flags)
-{
-	return commit_parse(commit, git_odb_object_data(odb_obj), git_odb_object_size(odb_obj), flags);
-}
-
 int git_commit__parse(void *_commit, git_odb_object *odb_obj)
 {
-	return git_commit__parse_ext(_commit, odb_obj, 0);
+	return git_commit__parse_raw(_commit,
+		git_odb_object_data(odb_obj),
+		git_odb_object_size(odb_obj));
 }
 
 #define GIT_COMMIT_GETTER(_rvalue, _name, _return) \
@@ -604,7 +582,7 @@ const char *git_commit_body(git_commit *commit)
 				break;
 
 		if (*msg)
-			commit->body = git__strndup(msg, end - msg + 1);
+			    commit->body = git__strndup(msg, end - msg + 1);
 	}
 
 	return commit->body;
@@ -878,14 +856,6 @@ static void format_header_field(git_buf *out, const char *field, const char *con
 	git_buf_putc(out, '\n');
 }
 
-static const git_oid *commit_parent_from_commit(size_t n, void *payload)
-{
-	const git_commit *commit = (const git_commit *) payload;
-
-	return git_array_get(commit->parent_ids, n);
-
-}
-
 int git_commit_create_with_signature(
 	git_oid *out,
 	git_repository *repo,
@@ -898,37 +868,20 @@ int git_commit_create_with_signature(
 	const char *field;
 	const char *header_end;
 	git_buf commit = GIT_BUF_INIT;
-	git_commit *parsed;
-	git_array_oid_t parents = GIT_ARRAY_INIT;
-
-	/* The first step is to verify that all the tree and parents exist */
-	parsed = git__calloc(1, sizeof(git_commit));
-	GIT_ERROR_CHECK_ALLOC(parsed);
-	if ((error = commit_parse(parsed, commit_content, strlen(commit_content), 0)) < 0)
-		goto cleanup;
-
-	if ((error = validate_tree_and_parents(&parents, repo, &parsed->tree_id, commit_parent_from_commit, parsed, NULL, true)) < 0)
-		goto cleanup;
 
-	git_array_clear(parents);
-
-	/* Then we start appending by identifying the end of the commit header */
+	/* We start by identifying the end of the commit header */
 	header_end = strstr(commit_content, "\n\n");
 	if (!header_end) {
 		git_error_set(GIT_ERROR_INVALID, "malformed commit contents");
-		error = -1;
-		goto cleanup;
+		return -1;
 	}
 
+	field = signature_field ? signature_field : "gpgsig";
+
 	/* The header ends after the first LF */
 	header_end++;
 	git_buf_put(&commit, commit_content, header_end - commit_content);
-
-	if (signature != NULL) {
-		field = signature_field ? signature_field : "gpgsig";
-		format_header_field(&commit, field, signature);
-	}
-
+	format_header_field(&commit, field, signature);
 	git_buf_puts(&commit, header_end);
 
 	if (git_buf_oom(&commit))
@@ -941,7 +894,6 @@ int git_commit_create_with_signature(
 		goto cleanup;
 
 cleanup:
-	git_commit__free(parsed);
 	git_buf_dispose(&commit);
 	return error;
 }

data/vendor/libgit2/src/commit.h

@@ -37,10 +37,4 @@ void git_commit__free(void *commit);
 int git_commit__parse(void *commit, git_odb_object *obj);
 int git_commit__parse_raw(void *commit, const char *data, size_t size);
 
-typedef enum {
-	GIT_COMMIT_PARSE_QUICK = (1 << 0), /**< Only parse parents and committer info */
-} git_commit__parse_flags;
-
-int git_commit__parse_ext(git_commit *commit, git_odb_object *odb_obj, unsigned int flags);
-
 #endif

data/vendor/libgit2/src/commit_list.c

@@ -10,7 +10,6 @@
 #include "revwalk.h"
 #include "pool.h"
 #include "odb.h"
-#include "commit.h"
 
 int git_commit_list_time_cmp(const void *a, const void *b)
 {
@@ -56,6 +55,17 @@ git_commit_list_node *git_commit_list_alloc_node(git_revwalk *walk)
 	return (git_commit_list_node *)git_pool_mallocz(&walk->commit_pool, 1);
 }
 
+static int commit_error(git_commit_list_node *commit, const char *msg)
+{
+	char commit_oid[GIT_OID_HEXSZ + 1];
+	git_oid_fmt(commit_oid, &commit->oid);
+	commit_oid[GIT_OID_HEXSZ] = '\0';
+
+	git_error_set(GIT_ERROR_ODB, "failed to parse commit %s - %s", commit_oid, msg);
+
+	return -1;
+}
+
 static git_commit_list_node **alloc_parents(
 	git_revwalk *walk, git_commit_list_node *commit, size_t n_parents)
 {
@@ -101,42 +111,77 @@ git_commit_list_node *git_commit_list_pop(git_commit_list **stack)
 
 static int commit_quick_parse(
 	git_revwalk *walk,
-	git_commit_list_node *node,
-	git_odb_object *obj)
+	git_commit_list_node *commit,
+	const uint8_t *buffer,
+	size_t buffer_len)
 {
-	git_oid *parent_oid;
-	git_commit *commit;
-	int error;
-	size_t i;
+	const size_t parent_len = strlen("parent ") + GIT_OID_HEXSZ + 1;
+	const uint8_t *buffer_end = buffer + buffer_len;
+	const uint8_t *parents_start, *committer_start;
+	int i, parents = 0;
+	int64_t commit_time;
+
+	buffer += strlen("tree ") + GIT_OID_HEXSZ + 1;
+
+	parents_start = buffer;
+	while (buffer + parent_len < buffer_end && memcmp(buffer, "parent ", strlen("parent ")) == 0) {
+		parents++;
+		buffer += parent_len;
+	}
 
-	commit = git__calloc(1, sizeof(*commit));
-	GIT_ERROR_CHECK_ALLOC(commit);
-	commit->object.repo = walk->repo;
+	commit->parents = alloc_parents(walk, commit, parents);
+	GIT_ERROR_CHECK_ALLOC(commit->parents);
 
-	if ((error = git_commit__parse_ext(commit, obj, GIT_COMMIT_PARSE_QUICK)) < 0) {
-		git__free(commit);
-		return error;
-	}
+	buffer = parents_start;
+	for (i = 0; i < parents; ++i) {
+		git_oid oid;
 
-	if (!git__is_uint16(git_array_size(commit->parent_ids))) {
-		git__free(commit);
-		git_error_set(GIT_ERROR_INVALID, "commit has more than 2^16 parents");
-		return -1;
-	}
+		if (git_oid_fromstr(&oid, (const char *)buffer + strlen("parent ")) < 0)
+			return -1;
 
-	node->time = commit->committer->when.time;
-	node->out_degree = (uint16_t) git_array_size(commit->parent_ids);
-	node->parents = alloc_parents(walk, node, node->out_degree);
-	GIT_ERROR_CHECK_ALLOC(node->parents);
+		commit->parents[i] = git_revwalk__commit_lookup(walk, &oid);
+		if (commit->parents[i] == NULL)
+			return -1;
 
-	git_array_foreach(commit->parent_ids, i, parent_oid) {
-		node->parents[i] = git_revwalk__commit_lookup(walk, parent_oid);
+		buffer += parent_len;
 	}
 
-	git_commit__free(commit);
+	commit->out_degree = (unsigned short)parents;
+
+	if ((committer_start = buffer = memchr(buffer, '\n', buffer_end - buffer)) == NULL)
+		return commit_error(commit, "object is corrupted");
+
+	buffer++;
+
+	if ((buffer = memchr(buffer, '\n', buffer_end - buffer)) == NULL)
+		return commit_error(commit, "object is corrupted");
+
+	/* Skip trailing spaces */
+	while (buffer > committer_start && git__isspace(*buffer))
+		buffer--;
+
+	/* Seek for the beginning of the pack of digits */
+	while (buffer > committer_start && git__isdigit(*buffer))
+		buffer--;
+
+	/* Skip potential timezone offset */
+	if ((buffer > committer_start) && (*buffer == '+' || *buffer == '-')) {
+		buffer--;
+
+		while (buffer > committer_start && git__isspace(*buffer))
+			buffer--;
+
+		while (buffer > committer_start && git__isdigit(*buffer))
+			buffer--;
+	}
 
-	node->parsed = 1;
+	if ((buffer == committer_start) ||
+	    (git__strntol64(&commit_time, (char *)(buffer + 1),
+			    buffer_end - buffer + 1, NULL, 10) < 0))
+		return commit_error(commit, "cannot parse commit time");
 
+	commit->time = commit_time;
+	commit->parsed = 1;
 	return 0;
 }
 
@@ -155,7 +200,10 @@ int git_commit_list_parse(git_revwalk *walk, git_commit_list_node *commit)
 		git_error_set(GIT_ERROR_INVALID, "object is no commit object");
 		error = -1;
 	} else
-		error = commit_quick_parse(walk, commit, obj);
+		error = commit_quick_parse(
+			walk, commit,
+			(const uint8_t *)git_odb_object_data(obj),
+			git_odb_object_size(obj));
 
 	git_odb_object_free(obj);
 	return error;

data/vendor/libgit2/src/commit_list.h

@@ -33,8 +33,8 @@ typedef struct git_commit_list_node {
 			 added:1,
 			 flags : FLAG_BITS;
 
-	uint16_t in_degree;
-	uint16_t out_degree;
+	unsigned short in_degree;
+	unsigned short out_degree;
 
 	struct git_commit_list_node **parents;
 } git_commit_list_node;

data/vendor/libgit2/src/common.h

@@ -47,7 +47,6 @@
 # include <ws2tcpip.h>
 # include "win32/msvc-compat.h"
 # include "win32/mingw-compat.h"
-# include "win32/w32_common.h"
 # include "win32/win32-compat.h"
 # include "win32/error.h"
 # include "win32/version.h"
@@ -77,7 +76,6 @@
 
 #include "git2/types.h"
 #include "git2/errors.h"
-#include "errors.h"
 #include "thread-utils.h"
 #include "integer.h"
 
@@ -87,7 +85,7 @@
  */
 #include "git2/deprecated.h"
 
-#include "posix.h"
+#include <regex.h>
 
 #define DEFAULT_BUFSIZE 65536
 #define FILEIO_BUFSIZE DEFAULT_BUFSIZE
@@ -110,6 +108,80 @@
 #define GIT_ERROR_CHECK_ERROR(code) \
 	do { int _err = (code); if (_err) return _err; } while (0)
 
+/**
+ * Set the error message for this thread, formatting as needed.
+ */
+
+void git_error_set(int error_class, const char *string, ...) GIT_FORMAT_PRINTF(2, 3);
+
+/**
+ * Set the error message for a regex failure, using the internal regex
+ * error code lookup and return a libgit error code.
+ */
+int git_error_set_regex(const regex_t *regex, int error_code);
+
+/**
+ * Set error message for user callback if needed.
+ *
+ * If the error code in non-zero and no error message is set, this
+ * sets a generic error message.
+ *
+ * @return This always returns the `error_code` parameter.
+ */
+GIT_INLINE(int) git_error_set_after_callback_function(
+	int error_code, const char *action)
+{
+	if (error_code) {
+		const git_error *e = git_error_last();
+		if (!e || !e->message)
+			git_error_set(e ? e->klass : GIT_ERROR_CALLBACK,
+				"%s callback returned %d", action, error_code);
+	}
+	return error_code;
+}
+
+#ifdef GIT_WIN32
+#define git_error_set_after_callback(code) \
+	git_error_set_after_callback_function((code), __FUNCTION__)
+#else
+#define git_error_set_after_callback(code) \
+	git_error_set_after_callback_function((code), __func__)
+#endif
+
+/**
+ * Gets the system error code for this thread.
+ */
+int git_error_system_last(void);
+
+/**
+ * Sets the system error code for this thread.
+ */
+void git_error_system_set(int code);
+
+/**
+ * Structure to preserve libgit2 error state
+ */
+typedef struct {
+	int error_code;
+	unsigned int oom : 1;
+	git_error error_msg;
+} git_error_state;
+
+/**
+ * Capture current error state to restore later, returning error code.
+ * If `error_code` is zero, this does not clear the current error state.
+ * You must either restore this error state, or free it.
+ */
+extern int git_error_state_capture(git_error_state *state, int error_code);
+
+/**
+ * Restore error state to a previous value, returning saved error code.
+ */
+extern int git_error_state_restore(git_error_state *state);
+
+/** Free an error state. */
+extern void git_error_state_free(git_error_state *state);
+
 /**
  * Check a versioned structure for validity
  */