rugged 0.24.6.1 → 0.25.0b1

data/vendor/libgit2/src/remote.c

@@ -1414,11 +1414,7 @@ static int update_tips_for_spec(
 		/* In autotag mode, don't overwrite any locally-existing tags */
 		error = git_reference_create(&ref, remote->repo, refname.ptr, &head->oid, !autotag, 
 				log_message);
-
-		if (error == GIT_EEXISTS)
-			continue;
-
-		if (error < 0)
+		if (error < 0 && error != GIT_EEXISTS)
 			goto on_error;
 
 		git_reference_free(ref);
@@ -2228,21 +2224,15 @@ static int remove_branch_config_related_entries(
 		if (git_buf_printf(&buf, "branch.%.*s.merge", (int)branch_len, branch) < 0)
 			break;
 
-		if ((error = git_config_delete_entry(config, git_buf_cstr(&buf))) < 0) {
-			if (error != GIT_ENOTFOUND)
-				break;
-			giterr_clear();
-		}
+		if ((error = git_config_delete_entry(config, git_buf_cstr(&buf))) < 0)
+			break;
 
 		git_buf_clear(&buf);
 		if (git_buf_printf(&buf, "branch.%.*s.remote", (int)branch_len, branch) < 0)
 			break;
 
-		if ((error = git_config_delete_entry(config, git_buf_cstr(&buf))) < 0) {
-			if (error != GIT_ENOTFOUND)
-				break;
-			giterr_clear();
-		}
+		if ((error = git_config_delete_entry(config, git_buf_cstr(&buf))) < 0)
+			break;
 	}
 
 	if (error == GIT_ITEROVER)

data/vendor/libgit2/src/repository.c

@@ -264,7 +264,7 @@ cleanup:
  * the stack could remove directories name limits, but at the cost of doing
  * repeated malloc/frees inside the loop below, so let's not do it now.
  */
-static size_t find_ceiling_dir_offset(
+static int find_ceiling_dir_offset(
 	const char *path,
 	const char *ceiling_directories)
 {
@@ -278,7 +278,7 @@ static size_t find_ceiling_dir_offset(
 	min_len = (size_t)(git_path_root(path) + 1);
 
 	if (ceiling_directories == NULL || min_len == 0)
-		return min_len;
+		return (int)min_len;
 
 	for (sep = ceil = ceiling_directories; *sep; ceil = sep + 1) {
 		for (sep = ceil; *sep && *sep != GIT_PATH_LIST_SEPARATOR; sep++);
@@ -305,7 +305,7 @@ static size_t find_ceiling_dir_offset(
 		}
 	}
 
-	return (max_len <= min_len ? min_len : max_len);
+	return (int)(max_len <= min_len ? min_len : max_len);
 }
 
 /*
@@ -359,36 +359,21 @@ static int find_repo(
 	git_buf path = GIT_BUF_INIT;
 	struct stat st;
 	dev_t initial_device = 0;
-	int min_iterations;
-	bool in_dot_git;
-	size_t ceiling_offset = 0;
+	bool try_with_dot_git = ((flags & GIT_REPOSITORY_OPEN_BARE) != 0);
+	int ceiling_offset;
 
 	git_buf_free(repo_path);
 
 	if ((error = git_path_prettify(&path, start_path, NULL)) < 0)
 		return error;
 
-	/* in_dot_git toggles each loop:
-	 * /a/b/c/.git, /a/b/c, /a/b/.git, /a/b, /a/.git, /a
-	 * With GIT_REPOSITORY_OPEN_BARE, we assume we started with /a/b/c.git
-	 * and don't append .git the first time through.
-	 * min_iterations indicates the number of iterations left before going
-	 * further counts as a search. */
-	if (flags & GIT_REPOSITORY_OPEN_BARE) {
-		in_dot_git = true;
-		min_iterations = 1;
-	} else {
-		in_dot_git = false;
-		min_iterations = 2;
-	}
+	ceiling_offset = find_ceiling_dir_offset(path.ptr, ceiling_dirs);
 
-	while (!error && (min_iterations || !(path.ptr[ceiling_offset] == 0 ||
-					      (flags & GIT_REPOSITORY_OPEN_NO_SEARCH)))) {
-		if (!in_dot_git)
-			if ((error = git_buf_joinpath(&path, path.ptr, DOT_GIT)) < 0)
-				break;
-		in_dot_git = !in_dot_git;
+	if (!try_with_dot_git &&
+		(error = git_buf_joinpath(&path, path.ptr, DOT_GIT)) < 0)
+		return error;
 
+	while (!error && !git_buf_len(repo_path)) {
 		if (p_stat(path.ptr, &st) == 0) {
 			/* check that we have not crossed device boundaries */
 			if (initial_device == 0)
@@ -429,10 +414,17 @@ static int find_repo(
 			break;
 		}
 
-		/* Once we've checked the directory (and .git if applicable),
-		 * find the ceiling for a search. */
-		if (min_iterations && (--min_iterations == 0))
-			ceiling_offset = find_ceiling_dir_offset(path.ptr, ceiling_dirs);
+		if (try_with_dot_git) {
+			/* if we tried original dir with and without .git AND either hit
+			 * directory ceiling or NO_SEARCH was requested, then be done.
+			 */
+			if (path.ptr[ceiling_offset] == '\0' ||
+				(flags & GIT_REPOSITORY_OPEN_NO_SEARCH) != 0)
+				break;
+			/* otherwise look first for .git item */
+			error = git_buf_joinpath(&path, path.ptr, DOT_GIT);
+		}
+		try_with_dot_git = !try_with_dot_git;
 	}
 
 	if (!error && parent_path && !(flags & GIT_REPOSITORY_OPEN_BARE)) {

data/vendor/libgit2/src/settings.c

@@ -71,18 +71,12 @@ static int config_level_to_sysdir(int config_level)
 }
 
 extern char *git__user_agent;
-extern char *git__ssl_ciphers;
 
 const char *git_libgit2__user_agent()
 {
 	return git__user_agent;
 }
 
-const char *git_libgit2__ssl_ciphers()
-{
-	return git__ssl_ciphers;
-}
-
 int git_libgit2_opts(int key, ...)
 {
 	int error = 0;
@@ -175,7 +169,7 @@ int git_libgit2_opts(int key, ...)
 			}
 		}
 #else
-		giterr_set(GITERR_NET, "cannot set certificate locations: OpenSSL is not enabled");
+		giterr_set(GITERR_NET, "Cannot set certificate locations: OpenSSL is not enabled");
 		error = -1;
 #endif
 		break;
@@ -193,22 +187,6 @@ int git_libgit2_opts(int key, ...)
 		git_object__strict_input_validation = (va_arg(ap, int) != 0);
 		break;
 
-	case GIT_OPT_SET_SSL_CIPHERS:
-#ifdef GIT_OPENSSL
-		{
-			git__free(git__ssl_ciphers);
-			git__ssl_ciphers = git__strdup(va_arg(ap, const char *));
-			if (!git__ssl_ciphers) {
-				giterr_set_oom();
-				error = -1;
-			}
-		}
-#else
-		giterr_set(GITERR_NET, "cannot set custom ciphers: OpenSSL is not enabled");
-		error = -1;
-#endif
-		break;
-
 	default:
 		giterr_set(GITERR_INVALID, "invalid option key");
 		error = -1;

data/vendor/libgit2/src/stransport_stream.c

@@ -16,7 +16,7 @@
 #include "socket_stream.h"
 #include "curl_stream.h"
 
-static int stransport_error(OSStatus ret)
+int stransport_error(OSStatus ret)
 {
 	CFStringRef message;
 
@@ -33,7 +33,6 @@ static int stransport_error(OSStatus ret)
 	CFRelease(message);
 #else
     giterr_set(GITERR_NET, "SecureTransport error: OSStatus %d", (unsigned int)ret);
-    GIT_UNUSED(message);
 #endif
 
 	return -1;
@@ -47,7 +46,7 @@ typedef struct {
 	git_cert_x509 cert_info;
 } stransport_stream;
 
-static int stransport_connect(git_stream *stream)
+int stransport_connect(git_stream *stream)
 {
 	stransport_stream *st = (stransport_stream *) stream;
 	int error;
@@ -67,9 +66,6 @@ static int stransport_connect(git_stream *stream)
 	if ((ret = SSLCopyPeerTrust(st->ctx, &trust)) != noErr)
 		goto on_error;
 
-	if (!trust)
-		return GIT_ECERTIFICATE;
-
 	if ((ret = SecTrustEvaluate(trust, &sec_res)) != noErr)
 		goto on_error;
 
@@ -93,7 +89,7 @@ on_error:
 	return stransport_error(ret);
 }
 
-static int stransport_certificate(git_cert **out, git_stream *stream)
+int stransport_certificate(git_cert **out, git_stream *stream)
 {
 	stransport_stream *st = (stransport_stream *) stream;
 	SecTrustRef trust = NULL;
@@ -120,7 +116,7 @@ static int stransport_certificate(git_cert **out, git_stream *stream)
 	return 0;
 }
 
-static int stransport_set_proxy(git_stream *stream, const char *proxy)
+int stransport_set_proxy(git_stream *stream, const char *proxy)
 {
 	stransport_stream *st = (stransport_stream *) stream;
 
@@ -150,7 +146,7 @@ static OSStatus write_cb(SSLConnectionRef conn, const void *data, size_t *len)
 	return noErr;
 }
 
-static ssize_t stransport_write(git_stream *stream, const char *data, size_t len, int flags)
+ssize_t stransport_write(git_stream *stream, const char *data, size_t len, int flags)
 {
 	stransport_stream *st = (stransport_stream *) stream;
 	size_t data_len, processed;
@@ -199,7 +195,7 @@ static OSStatus read_cb(SSLConnectionRef conn, void *data, size_t *len)
 	return error;
 }
 
-static ssize_t stransport_read(git_stream *stream, void *data, size_t len)
+ssize_t stransport_read(git_stream *stream, void *data, size_t len)
 {
 	stransport_stream *st = (stransport_stream *) stream;
 	size_t processed;
@@ -211,7 +207,7 @@ static ssize_t stransport_read(git_stream *stream, void *data, size_t len)
 	return processed;
 }
 
-static int stransport_close(git_stream *stream)
+int stransport_close(git_stream *stream)
 {
 	stransport_stream *st = (stransport_stream *) stream;
 	OSStatus ret;
@@ -223,7 +219,7 @@ static int stransport_close(git_stream *stream)
 	return git_stream_close(st->io);
 }
 
-static void stransport_free(git_stream *stream)
+void stransport_free(git_stream *stream)
 {
 	stransport_stream *st = (stransport_stream *) stream;
 
@@ -259,7 +255,6 @@ int git_stransport_stream_new(git_stream **out, const char *host, const char *po
 	st->ctx = SSLCreateContext(NULL, kSSLClientSide, kSSLStreamType);
 	if (!st->ctx) {
 		giterr_set(GITERR_NET, "failed to create SSL context");
-		git__free(st);
 		return -1;
 	}
 
@@ -269,8 +264,7 @@ int git_stransport_stream_new(git_stream **out, const char *host, const char *po
 	    (ret = SSLSetProtocolVersionMin(st->ctx, kTLSProtocol1)) != noErr ||
 	    (ret = SSLSetProtocolVersionMax(st->ctx, kTLSProtocol12)) != noErr ||
 	    (ret = SSLSetPeerDomainName(st->ctx, host, strlen(host))) != noErr) {
-		CFRelease(st->ctx);
-		git__free(st);
+		git_stream_free((git_stream *)st);
 		return stransport_error(ret);
 	}
 

data/vendor/libgit2/src/submodule.c

@@ -80,8 +80,7 @@ static kh_inline int str_equal_no_trailing_slash(const char *a, const char *b)
 	if (blen > 0 && b[blen - 1] == '/')
 		blen--;
 
-	return (alen == 0 && blen == 0) ||
-		(alen == blen && strncmp(a, b, alen) == 0);
+	return (alen == blen && strncmp(a, b, alen) == 0);
 }
 
 __KHASH_IMPL(
@@ -1417,7 +1416,7 @@ static int submodule_update_head(git_submodule *submodule)
 		git_tree_entry_bypath(&te, head, submodule->path) < 0)
 		giterr_clear();
 	else
-		submodule_update_from_head_data(submodule, te->attr, git_tree_entry_id(te));
+		submodule_update_from_head_data(submodule, te->attr, &te->oid);
 
 	git_tree_entry_free(te);
 	git_tree_free(head);

data/vendor/libgit2/src/sysdir.c

@@ -83,43 +83,45 @@ static int git_sysdir_guess_template_dirs(git_buf *out)
 #endif
 }
 
-struct git_sysdir__dir {
-	git_buf buf;
-	int (*guess)(git_buf *out);
-};
+typedef int (*git_sysdir_guess_cb)(git_buf *out);
 
-static struct git_sysdir__dir git_sysdir__dirs[] = {
-	{ GIT_BUF_INIT, git_sysdir_guess_system_dirs },
-	{ GIT_BUF_INIT, git_sysdir_guess_global_dirs },
-	{ GIT_BUF_INIT, git_sysdir_guess_xdg_dirs },
-	{ GIT_BUF_INIT, git_sysdir_guess_programdata_dirs },
-	{ GIT_BUF_INIT, git_sysdir_guess_template_dirs },
-};
+static git_buf git_sysdir__dirs[GIT_SYSDIR__MAX] =
+	{ GIT_BUF_INIT, GIT_BUF_INIT, GIT_BUF_INIT, GIT_BUF_INIT, GIT_BUF_INIT };
 
-static void git_sysdir_global_shutdown(void)
-{
-	size_t i;
+static git_sysdir_guess_cb git_sysdir__dir_guess[GIT_SYSDIR__MAX] = {
+	git_sysdir_guess_system_dirs,
+	git_sysdir_guess_global_dirs,
+	git_sysdir_guess_xdg_dirs,
+	git_sysdir_guess_programdata_dirs,
+	git_sysdir_guess_template_dirs,
+};
 
-	for (i = 0; i < ARRAY_SIZE(git_sysdir__dirs); ++i)
-		git_buf_free(&git_sysdir__dirs[i].buf);
-}
+static int git_sysdir__dirs_shutdown_set = 0;
 
 int git_sysdir_global_init(void)
 {
-	size_t i;
+	git_sysdir_t i;
+	const git_buf *path;
 	int error = 0;
 
-	for (i = 0; !error && i < ARRAY_SIZE(git_sysdir__dirs); i++)
-		error = git_sysdir__dirs[i].guess(&git_sysdir__dirs[i].buf);
-
-	git__on_shutdown(git_sysdir_global_shutdown);
+	for (i = 0; !error && i < GIT_SYSDIR__MAX; i++)
+		error = git_sysdir_get(&path, i);
 
 	return error;
 }
 
+void git_sysdir_global_shutdown(void)
+{
+	int i;
+	for (i = 0; i < GIT_SYSDIR__MAX; ++i)
+		git_buf_free(&git_sysdir__dirs[i]);
+
+	git_sysdir__dirs_shutdown_set = 0;
+}
+
 static int git_sysdir_check_selector(git_sysdir_t which)
 {
-	if (which < ARRAY_SIZE(git_sysdir__dirs))
+	if (which < GIT_SYSDIR__MAX)
 		return 0;
 
 	giterr_set(GITERR_INVALID, "config directory selector out of range");
@@ -135,7 +137,18 @@ int git_sysdir_get(const git_buf **out, git_sysdir_t which)
 
 	GITERR_CHECK_ERROR(git_sysdir_check_selector(which));
 
-	*out = &git_sysdir__dirs[which].buf;
+	if (!git_buf_len(&git_sysdir__dirs[which])) {
+		/* prepare shutdown if we're going to need it */
+		if (!git_sysdir__dirs_shutdown_set) {
+			git__on_shutdown(git_sysdir_global_shutdown);
+			git_sysdir__dirs_shutdown_set = 1;
+		}
+
+		GITERR_CHECK_ERROR(
+			git_sysdir__dir_guess[which](&git_sysdir__dirs[which]));
+	}
+
+	*out = &git_sysdir__dirs[which];
 	return 0;
 }
 
@@ -170,38 +183,31 @@ int git_sysdir_set(git_sysdir_t which, const char *search_path)
 	if (search_path != NULL)
 		expand_path = strstr(search_path, PATH_MAGIC);
 
-	/* reset the default if this path has been cleared */
-	if (!search_path || expand_path)
-		git_sysdir__dirs[which].guess(&git_sysdir__dirs[which].buf);
+	/* init with default if not yet done and needed (ignoring error) */
+	if ((!search_path || expand_path) &&
+		!git_buf_len(&git_sysdir__dirs[which]))
+		git_sysdir__dir_guess[which](&git_sysdir__dirs[which]);
 
 	/* if $PATH is not referenced, then just set the path */
-	if (!expand_path) {
-		if (search_path)
-			git_buf_sets(&git_sysdir__dirs[which].buf, search_path);
-
-		goto done;
-	}
+	if (!expand_path)
+		return git_buf_sets(&git_sysdir__dirs[which], search_path);
 
 	/* otherwise set to join(before $PATH, old value, after $PATH) */
 	if (expand_path > search_path)
 		git_buf_set(&merge, search_path, expand_path - search_path);
 
-	if (git_buf_len(&git_sysdir__dirs[which].buf))
+	if (git_buf_len(&git_sysdir__dirs[which]))
 		git_buf_join(&merge, GIT_PATH_LIST_SEPARATOR,
-			merge.ptr, git_sysdir__dirs[which].buf.ptr);
+			merge.ptr, git_sysdir__dirs[which].ptr);
 
 	expand_path += strlen(PATH_MAGIC);
 	if (*expand_path)
 		git_buf_join(&merge, GIT_PATH_LIST_SEPARATOR, merge.ptr, expand_path);
 
-	git_buf_swap(&git_sysdir__dirs[which].buf, &merge);
+	git_buf_swap(&git_sysdir__dirs[which], &merge);
 	git_buf_free(&merge);
 
-done:
-	if (git_buf_oom(&git_sysdir__dirs[which].buf))
-		return -1;
-
-	return 0;
+	return git_buf_oom(&git_sysdir__dirs[which]) ? -1 : 0;
 }
 
 static int git_sysdir_find_in_dirlist(

data/vendor/libgit2/src/sysdir.h

@@ -103,4 +103,9 @@ extern int git_sysdir_get_str(char *out, size_t outlen, git_sysdir_t which);
  */
 extern int git_sysdir_set(git_sysdir_t which, const char *paths);
 
+/**
+ * Free the configuration file search paths.
+ */
+extern void git_sysdir_global_shutdown(void);
+
 #endif /* INCLUDE_sysdir_h__ */