rugged 0.21.1b2 → 0.21.2

data/vendor/libgit2/src/revert.c

@@ -174,7 +174,7 @@ int git_revert(
 	char commit_oidstr[GIT_OID_HEXSZ + 1];
 	const char *commit_msg;
 	git_buf their_label = GIT_BUF_INIT;
-	git_index *index_new = NULL;
+	git_index *index_new = NULL, *index_repo = NULL;
 	int error;
 
 	assert(repo && commit);
@@ -199,9 +199,10 @@ int git_revert(
 		(error = git_repository_head(&our_ref, repo)) < 0 ||
 		(error = git_reference_peel((git_object **)&our_commit, our_ref, GIT_OBJ_COMMIT)) < 0 ||
 		(error = git_revert_commit(&index_new, repo, commit, our_commit, opts.mainline, &opts.merge_opts)) < 0 ||
-		(error = git_merge__check_result(repo, index_new)) < 0 ||
-		(error = git_merge__append_conflicts_to_merge_msg(repo, index_new)) < 0 ||
-		(error = git_checkout_index(repo, index_new, &opts.checkout_opts)) < 0)
+		(error = git_merge__indexes(repo, index_new)) < 0 ||
+		(error = git_repository_index(&index_repo, repo)) < 0 ||
+		(error = git_merge__append_conflicts_to_merge_msg(repo, index_repo)) < 0 ||
+		(error = git_checkout_index(repo, index_repo, &opts.checkout_opts)) < 0)
 		goto on_error;
 
 	goto done;
@@ -211,6 +212,7 @@ on_error:
 
 done:
 	git_index_free(index_new);
+	git_index_free(index_repo);
 	git_commit_free(our_commit);
 	git_reference_free(our_ref);
 	git_buf_free(&their_label);

data/vendor/libgit2/src/revparse.c

@@ -205,6 +205,7 @@ cleanup:
 static int retrieve_oid_from_reflog(git_oid *oid, git_reference *ref, size_t identifier)
 {
 	git_reflog *reflog;
+	int error = -1;
 	size_t numentries;
 	const git_reflog_entry *entry;
 	bool search_by_pos = (identifier <= 100000000);
@@ -215,11 +216,21 @@ static int retrieve_oid_from_reflog(git_oid *oid, git_reference *ref, size_t ide
 	numentries = git_reflog_entrycount(reflog);
 
 	if (search_by_pos) {
-		if (numentries < identifier + 1)
-			goto notfound;
+		if (numentries < identifier + 1) {
+			giterr_set(
+				GITERR_REFERENCE,
+				"Reflog for '%s' has only %"PRIuZ" entries, asked for %"PRIuZ,
+				git_reference_name(ref), numentries, identifier);
+
+			error = GIT_ENOTFOUND;
+			goto cleanup;
+		}
 
 		entry = git_reflog_entry_byindex(reflog, identifier);
 		git_oid_cpy(oid, git_reflog_entry_id_new(entry));
+		error = 0;
+		goto cleanup;
+
 	} else {
 		size_t i;
 		git_time commit_time;
@@ -232,24 +243,16 @@ static int retrieve_oid_from_reflog(git_oid *oid, git_reference *ref, size_t ide
 				continue;
 
 			git_oid_cpy(oid, git_reflog_entry_id_new(entry));
-			break;
+			error = 0;
+			goto cleanup;
 		}
 
-		if (i == numentries)
-			goto notfound;
+		error = GIT_ENOTFOUND;
 	}
 
+cleanup:
 	git_reflog_free(reflog);
-	return 0;
-
-notfound:
-	giterr_set(
-		GITERR_REFERENCE,
-		"Reflog for '%s' has only %"PRIuZ" entries, asked for %"PRIuZ,
-		git_reference_name(ref), numentries, identifier);
-
-	git_reflog_free(reflog);
-	return GIT_ENOTFOUND;
+	return error;
 }
 
 static int retrieve_revobject_from_reflog(git_object **out, git_reference **base_ref, git_repository *repo, const char *identifier, size_t position)

data/vendor/libgit2/src/signature.c

@@ -70,9 +70,9 @@ int git_signature_new(git_signature **sig_out, const char *name, const char *ema
 	if (p->name == NULL || p->email == NULL)
 		return -1; /* oom */
 
-	if (p->name[0] == '\0' || p->email[0] == '\0') {
+	if (p->name[0] == '\0') {
 		git_signature_free(p);
-		return signature_error("Signature cannot have an empty name or email");
+		return signature_error("Signature cannot have an empty name");
 	}
 
 	p->when.time = time;

data/vendor/libgit2/src/stash.c

@@ -636,8 +636,7 @@ int git_stash_drop(
 		entry = git_reflog_entry_byindex(reflog, 0);
 
 		git_reference_free(stash);
-		error = git_reference_create(&stash, repo, GIT_REFS_STASH_FILE, &entry->oid_cur, 1, NULL, NULL);
-		if (error < 0)
+		if ((error = git_reference_create(&stash, repo, GIT_REFS_STASH_FILE, &entry->oid_cur, 1, NULL, NULL) < 0))
 			goto cleanup;
 
 		/* We need to undo the writing that we just did */

data/vendor/libgit2/src/status.c

@@ -62,9 +62,6 @@ static unsigned int workdir_delta2status(
 	case GIT_DELTA_UNTRACKED:
 		st = GIT_STATUS_WT_NEW;
 		break;
-	case GIT_DELTA_UNREADABLE:
-		st = GIT_STATUS_WT_UNREADABLE;
-		break;
 	case GIT_DELTA_DELETED:
 		st = GIT_STATUS_WT_DELETED;
 		break;
@@ -313,10 +310,6 @@ int git_status_list_new(
 		diffopt.flags = diffopt.flags | GIT_DIFF_IGNORE_SUBMODULES;
 	if ((flags & GIT_STATUS_OPT_UPDATE_INDEX) != 0)
 		diffopt.flags = diffopt.flags | GIT_DIFF_UPDATE_INDEX;
-	if ((flags & GIT_STATUS_OPT_INCLUDE_UNREADABLE) != 0)
-		diffopt.flags = diffopt.flags | GIT_DIFF_INCLUDE_UNREADABLE;
-	if ((flags & GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED) != 0)
-		diffopt.flags = diffopt.flags | GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED;
 
 	if ((flags & GIT_STATUS_OPT_RENAMES_FROM_REWRITES) != 0)
 		findopt.flags = findopt.flags |
@@ -336,9 +329,8 @@ int git_status_list_new(
 
 	if (show != GIT_STATUS_SHOW_INDEX_ONLY) {
 		if ((error = git_diff_index_to_workdir(
-				&status->idx2wd, repo, index, &diffopt)) < 0) {
+				&status->idx2wd, repo, index, &diffopt)) < 0)
 			goto done;
-		}
 
 		if ((flags & GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR) != 0 &&
 			(error = git_diff_find_similar(status->idx2wd, &findopt)) < 0)
@@ -415,9 +407,8 @@ int git_status_foreach_ext(
 	size_t i;
 	int error = 0;
 
-	if ((error = git_status_list_new(&status, repo, opts)) < 0) {
+	if ((error = git_status_list_new(&status, repo, opts)) < 0)
 		return error;
-	}
 
 	git_vector_foreach(&status->paired, i, status_entry) {
 		const char *path = status_entry->head_to_index ?

data/vendor/libgit2/src/strnlen.h

@@ -7,8 +7,7 @@
 #ifndef INCLUDE_strlen_h__
 #define INCLUDE_strlen_h__
 
-#if defined(__MINGW32__) || defined(__sun) || defined(__APPLE__) || defined(__MidnightBSD__) ||\
-	(defined(_MSC_VER) && _MSC_VER < 1500)
+#if defined(__MINGW32__) || defined(__sun) || defined(__APPLE__) || defined(__MidnightBSD__)
 #   define NO_STRNLEN
 #endif
 

data/vendor/libgit2/src/submodule.c

@@ -306,56 +306,6 @@ void git_submodule_cache_free(git_repository *repo)
 		submodule_cache_free(cache);
 }
 
-static int submodule_repo_init(
-	git_repository **out,
-	git_repository *parent_repo,
-	const char *path,
-	const char *url,
-	bool use_gitlink)
-{
-	int error = 0;
-	git_buf workdir = GIT_BUF_INIT, repodir = GIT_BUF_INIT;
-	git_repository_init_options initopt = GIT_REPOSITORY_INIT_OPTIONS_INIT;
-	git_repository *subrepo = NULL;
-
-	error = git_buf_joinpath(&workdir, git_repository_workdir(parent_repo), path);
-	if (error < 0)
-		goto cleanup;
-
-	initopt.flags = GIT_REPOSITORY_INIT_MKPATH | GIT_REPOSITORY_INIT_NO_REINIT;
-	initopt.origin_url = url;
-
-	/* init submodule repository and add origin remote as needed */
-
-	/* New style: sub-repo goes in <repo-dir>/modules/<name>/ with a
-	 * gitlink in the sub-repo workdir directory to that repository
-	 *
-	 * Old style: sub-repo goes directly into repo/<name>/.git/
-	 */
-	 if (use_gitlink) {
-		error = git_buf_join3(
-			&repodir, '/', git_repository_path(parent_repo), "modules", path);
-		if (error < 0)
-			goto cleanup;
-
-		initopt.workdir_path = workdir.ptr;
-		initopt.flags |=
-			GIT_REPOSITORY_INIT_NO_DOTGIT_DIR |
-			GIT_REPOSITORY_INIT_RELATIVE_GITLINK;
-
-		error = git_repository_init_ext(&subrepo, repodir.ptr, &initopt);
-	} else
-		error = git_repository_init_ext(&subrepo, workdir.ptr, &initopt);
-
-cleanup:
-	git_buf_free(&workdir);
-	git_buf_free(&repodir);
-
-	*out = subrepo;
-
-	return error;
-}
-
 int git_submodule_add_setup(
 	git_submodule **out,
 	git_repository *repo,
@@ -367,6 +317,7 @@ int git_submodule_add_setup(
 	git_config_backend *mods = NULL;
 	git_submodule *sm = NULL;
 	git_buf name = GIT_BUF_INIT, real_url = GIT_BUF_INIT;
+	git_repository_init_options initopt = GIT_REPOSITORY_INIT_OPTIONS_INIT;
 	git_repository *subrepo = NULL;
 
 	assert(repo && url && path);
@@ -420,14 +371,41 @@ int git_submodule_add_setup(
 	if (error < 0)
 		goto cleanup;
 
-	/* if the repo does not already exist, then init a new repo and add it.
-	 * Otherwise, just add the existing repo.
+	/* New style: sub-repo goes in <repo-dir>/modules/<name>/ with a
+	 * gitlink in the sub-repo workdir directory to that repository
+	 *
+	 * Old style: sub-repo goes directly into repo/<name>/.git/
 	 */
-	if (!(git_path_exists(name.ptr) &&
-		git_path_contains(&name, DOT_GIT))) {
-		if ((error = submodule_repo_init(&subrepo, repo, path, real_url.ptr, use_gitlink)) < 0)
+
+	initopt.flags = GIT_REPOSITORY_INIT_MKPATH |
+		GIT_REPOSITORY_INIT_NO_REINIT;
+	initopt.origin_url = real_url.ptr;
+
+	if (git_path_exists(name.ptr) &&
+		git_path_contains(&name, DOT_GIT))
+	{
+		/* repo appears to already exist - reinit? */
+	}
+	else if (use_gitlink) {
+		git_buf repodir = GIT_BUF_INIT;
+
+		error = git_buf_join3(
+			&repodir, '/', git_repository_path(repo), "modules", path);
+		if (error < 0)
 			goto cleanup;
+
+		initopt.workdir_path = name.ptr;
+		initopt.flags |= GIT_REPOSITORY_INIT_NO_DOTGIT_DIR;
+
+		error = git_repository_init_ext(&subrepo, repodir.ptr, &initopt);
+
+		git_buf_free(&repodir);
 	}
+	else {
+		error = git_repository_init_ext(&subrepo, name.ptr, &initopt);
+	}
+	if (error < 0)
+		goto cleanup;
 
 	/* add submodule to hash and "reload" it */
 
@@ -459,23 +437,6 @@ cleanup:
 	return error;
 }
 
-int git_submodule_repo_init(
-	git_repository **out,
-	const git_submodule *sm,
-	int use_gitlink)
-{
-	int error;
-	git_repository *sub_repo = NULL;
-
-	assert(out && sm);
-
-	error = submodule_repo_init(&sub_repo, sm->repo, sm->path, sm->url, use_gitlink);
-
-	*out = sub_repo;
-
-	return error;
-}
-
 int git_submodule_add_finalize(git_submodule *sm)
 {
 	int error;
@@ -1936,7 +1897,6 @@ static void submodule_get_index_status(unsigned int *status, git_submodule *sm)
 		*status |= GIT_SUBMODULE_STATUS_INDEX_MODIFIED;
 }
 
-
 static void submodule_get_wd_status(
 	unsigned int *status,
 	git_submodule *sm,

data/vendor/libgit2/src/tag.c

@@ -406,8 +406,9 @@ int git_tag_delete(git_repository *repo, const char *tag_name)
 	if (error < 0)
 		return error;
 
-	if ((error = git_reference_delete(tag_ref)) == 0)
-		git_reference_free(tag_ref);
+	error = git_reference_delete(tag_ref);
+
+	git_reference_free(tag_ref);
 
 	return error;
 }

data/vendor/libgit2/src/thread-utils.h

@@ -53,6 +53,12 @@ typedef struct {
 
 #endif
 
+#if defined(GIT_WIN32)
+#define git_thread_yield() Sleep(0)
+#else
+#define git_thread_yield() sched_yield()
+#endif
+
 /* Pthreads Mutex */
 #define git_mutex pthread_mutex_t
 #define git_mutex_init(a)	pthread_mutex_init(a, NULL)
@@ -180,6 +186,7 @@ GIT_INLINE(int64_t) git_atomic64_add(git_atomic64 *a, int64_t addend)
 #define git_thread unsigned int
 #define git_thread_create(thread, attr, start_routine, arg) 0
 #define git_thread_join(id, status) (void)0
+#define git_thread_yield() (void)0
 
 /* Pthreads Mutex */
 #define git_mutex unsigned int

data/vendor/libgit2/src/trace.h

@@ -46,16 +46,8 @@ GIT_INLINE(void) git_trace__write_fmt(
 
 #else
 
-GIT_INLINE(void) git_trace__null(
-	git_trace_level_t level,
-	const char *fmt, ...)
-{
-	GIT_UNUSED(level);
-	GIT_UNUSED(fmt);
-}
-
 #define git_trace_level()		((void)0)
-#define git_trace			git_trace__null
+#define git_trace(lvl, ...)		((void)0)
 
 #endif
 

data/vendor/libgit2/src/transport.c

@@ -9,11 +9,11 @@
 #include "git2/remote.h"
 #include "git2/net.h"
 #include "git2/transport.h"
-#include "git2/sys/transport.h"
 #include "path.h"
 
 typedef struct transport_definition {
 	char *prefix;
+	unsigned priority;
 	git_transport_cb fn;
 	void *param;
 } transport_definition;
@@ -24,55 +24,52 @@ static git_smart_subtransport_definition git_subtransport_definition = { git_sma
 static git_smart_subtransport_definition ssh_subtransport_definition = { git_smart_subtransport_ssh, 0 };
 #endif
 
-static transport_definition local_transport_definition = { "file://", git_transport_local, NULL };
+static transport_definition local_transport_definition = { "file://", 1, git_transport_local, NULL };
+#ifdef GIT_SSH
+static transport_definition ssh_transport_definition = { "ssh://", 1, git_transport_smart, &ssh_subtransport_definition };
+#else
+static transport_definition dummy_transport_definition = { NULL, 1, git_transport_dummy, NULL };
+#endif
 
 static transport_definition transports[] = {
-	{ "git://",   git_transport_smart, &git_subtransport_definition },
-	{ "http://",  git_transport_smart, &http_subtransport_definition },
-#if defined(GIT_SSL) || defined(GIT_WINHTTP)
-	{ "https://", git_transport_smart, &http_subtransport_definition },
-#endif
-	{ "file://",  git_transport_local, NULL },
+	{"git://", 1, git_transport_smart, &git_subtransport_definition},
+	{"http://", 1, git_transport_smart, &http_subtransport_definition},
+	{"https://", 1, git_transport_smart, &http_subtransport_definition},
+	{"file://", 1, git_transport_local, NULL},
 #ifdef GIT_SSH
-	{ "ssh://",   git_transport_smart, &ssh_subtransport_definition },
+	{"ssh://", 1, git_transport_smart, &ssh_subtransport_definition},
 #endif
-	{ NULL, 0, 0 }
+	{NULL, 0, 0}
 };
 
-static git_vector custom_transports = GIT_VECTOR_INIT;
+static git_vector additional_transports = GIT_VECTOR_INIT;
 
 #define GIT_TRANSPORT_COUNT (sizeof(transports)/sizeof(transports[0])) - 1
 
-static transport_definition * transport_find_by_url(const char *url)
+static int transport_find_fn(const char *url, git_transport_cb *callback, void **param)
 {
 	size_t i = 0;
-	transport_definition *d;
+	unsigned priority = 0;
+	transport_definition *definition = NULL, *definition_iter;
 
-	/* Find a user transport who wants to deal with this URI */
-	git_vector_foreach(&custom_transports, i, d) {
-		if (strncasecmp(url, d->prefix, strlen(d->prefix)) == 0) {
-			return d;
-		}
-	}
-
-	/* Find a system transport for this URI */
+	// First, check to see if it's an obvious URL, which a URL scheme
 	for (i = 0; i < GIT_TRANSPORT_COUNT; ++i) {
-		d = &transports[i];
+		definition_iter = &transports[i];
 
-		if (strncasecmp(url, d->prefix, strlen(d->prefix)) == 0) {
-			return d;
-		}
+		if (strncasecmp(url, definition_iter->prefix, strlen(definition_iter->prefix)))
+			continue;
+
+		if (definition_iter->priority > priority)
+			definition = definition_iter;
 	}
 
-	return NULL;
-}
+	git_vector_foreach(&additional_transports, i, definition_iter) {
+		if (strncasecmp(url, definition_iter->prefix, strlen(definition_iter->prefix)))
+			continue;
 
-static int transport_find_fn(
-	git_transport_cb *out,
-	const char *url,
-	void **param)
-{
-	transport_definition *definition = transport_find_by_url(url);
+		if (definition_iter->priority > priority)
+			definition = definition_iter;
+	}
 
 #ifdef GIT_WIN32
 	/* On Windows, it might not be possible to discern between absolute local
@@ -89,10 +86,12 @@ static int transport_find_fn(
 
 	/* It could be a SSH remote path. Check to see if there's a :
 	 * SSH is an unsupported transport mechanism in this version of libgit2 */
-	if (!definition && strrchr(url, ':')) {
-		// re-search transports again with ssh:// as url so that we can find a third party ssh transport
-		definition = transport_find_by_url("ssh://");
-	}
+	if (!definition && strrchr(url, ':'))
+#ifdef GIT_SSH
+		definition = &ssh_transport_definition;
+#else
+        definition = &dummy_transport_definition;
+#endif
 
 #ifndef GIT_WIN32
 	/* Check to see if the path points to a file on the local file system */
@@ -101,9 +100,9 @@ static int transport_find_fn(
 #endif
 
 	if (!definition)
-		return GIT_ENOTFOUND;
+		return -1;
 
-	*out = definition->fn;
+	*callback = definition->fn;
 	*param = definition->param;
 
 	return 0;
@@ -113,6 +112,15 @@ static int transport_find_fn(
  * Public API *
  **************/
 
+int git_transport_dummy(git_transport **transport, git_remote *owner, void *param)
+{
+	GIT_UNUSED(transport);
+	GIT_UNUSED(owner);
+	GIT_UNUSED(param);
+	giterr_set(GITERR_NET, "This transport isn't implemented. Sorry");
+	return -1;
+}
+
 int git_transport_new(git_transport **out, git_remote *owner, const char *url)
 {
 	git_transport_cb fn;
@@ -120,96 +128,83 @@ int git_transport_new(git_transport **out, git_remote *owner, const char *url)
 	void *param;
 	int error;
 
-	if ((error = transport_find_fn(&fn, url, &param)) == GIT_ENOTFOUND) {
+	if (transport_find_fn(url, &fn, &param) < 0) {
 		giterr_set(GITERR_NET, "Unsupported URL protocol");
 		return -1;
-	} else if (error < 0)
-		return error;
+	}
 
-	if ((error = fn(&transport, owner, param)) < 0)
+	error = fn(&transport, owner, param);
+	if (error < 0)
 		return error;
 
-	GITERR_CHECK_VERSION(transport, GIT_TRANSPORT_VERSION, "git_transport");
-
 	*out = transport;
 
 	return 0;
 }
 
 int git_transport_register(
-	const char *scheme,
+	const char *prefix,
+	unsigned priority,
 	git_transport_cb cb,
 	void *param)
 {
-	git_buf prefix = GIT_BUF_INIT;
-	transport_definition *d, *definition = NULL;
-	size_t i;
-	int error = 0;
-
-	assert(scheme);
-	assert(cb);
+	transport_definition *d;
 
-	if ((error = git_buf_printf(&prefix, "%s://", scheme)) < 0)
-		goto on_error;
+	d = git__calloc(sizeof(transport_definition), 1);
+	GITERR_CHECK_ALLOC(d);
 
-	git_vector_foreach(&custom_transports, i, d) {
-		if (strcasecmp(d->prefix, prefix.ptr) == 0) {
-			error = GIT_EEXISTS;
-			goto on_error;
-		}
-	}
+	d->prefix = git__strdup(prefix);
 
-	definition = git__calloc(1, sizeof(transport_definition));
-	GITERR_CHECK_ALLOC(definition);
+	if (!d->prefix)
+		goto on_error;
 
-	definition->prefix = git_buf_detach(&prefix);
-	definition->fn = cb;
-	definition->param = param;
+	d->priority = priority;
+	d->fn = cb;
+	d->param = param;
 
-	if (git_vector_insert(&custom_transports, definition) < 0)
+	if (git_vector_insert(&additional_transports, d) < 0)
 		goto on_error;
 
 	return 0;
 
 on_error:
-	git_buf_free(&prefix);
-	git__free(definition);
-	return error;
+	git__free(d->prefix);
+	git__free(d);
+	return -1;
 }
 
-int git_transport_unregister(const char *scheme)
+int git_transport_unregister(
+	const char *prefix,
+	unsigned priority)
 {
-	git_buf prefix = GIT_BUF_INIT;
 	transport_definition *d;
-	size_t i;
-	int error = 0;
-
-	assert(scheme);
-
-	if ((error = git_buf_printf(&prefix, "%s://", scheme)) < 0)
-		goto done;
+	unsigned i;
 
-	git_vector_foreach(&custom_transports, i, d) {
-		if (strcasecmp(d->prefix, prefix.ptr) == 0) {
-			if ((error = git_vector_remove(&custom_transports, i)) < 0)
-				goto done;
+	git_vector_foreach(&additional_transports, i, d) {
+		if (d->priority == priority && !strcasecmp(d->prefix, prefix)) {
+			if (git_vector_remove(&additional_transports, i) < 0)
+				return -1;
 
 			git__free(d->prefix);
 			git__free(d);
 
-			if (!custom_transports.length)
-				git_vector_free(&custom_transports);
+			if (!additional_transports.length)
+				git_vector_free(&additional_transports);
 
-			error = 0;
-			goto done;
+			return 0;
 		}
 	}
 
-	error = GIT_ENOTFOUND;
+	return GIT_ENOTFOUND;
+}
 
-done:
-	git_buf_free(&prefix);
-	return error;
+/* from remote.h */
+int git_remote_valid_url(const char *url)
+{
+	git_transport_cb fn;
+	void *param;
+
+	return !transport_find_fn(url, &fn, &param);
 }
 
 int git_remote_supported_url(const char* url)
@@ -217,8 +212,10 @@ int git_remote_supported_url(const char* url)
 	git_transport_cb fn;
 	void *param;
 
-	/* The only error we expect is ENOTFOUND */
-	return !transport_find_fn(&fn, url, &param);
+	if (transport_find_fn(url, &fn, &param) < 0)
+		return 0;
+
+	return fn != &git_transport_dummy;
 }
 
 int git_transport_init(git_transport *opts, unsigned int version)