rugged 0.27.7 → 0.27.9

data/vendor/libgit2/src/streams/openssl.h

@@ -17,4 +17,111 @@ extern int git_openssl_stream_new(git_stream **out, const char *host, const char
 
 extern int git_openssl__set_cert_location(const char *file, const char *path);
 
+/*
+ * OpenSSL 1.1 made BIO opaque so we have to use functions to interact with it
+ * which do not exist in previous versions. We define these inline functions so
+ * we can program against the interface instead of littering the implementation
+ * with ifdefs.
+ */
+#ifdef GIT_OPENSSL
+# include <openssl/ssl.h>
+# include <openssl/err.h>
+# include <openssl/x509v3.h>
+# include <openssl/bio.h>
+
+
+
+# if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+     (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+
+GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name)
+{
+	BIO_METHOD *meth = git__calloc(1, sizeof(BIO_METHOD));
+	if (!meth) {
+		return NULL;
+	}
+
+	meth->type = type;
+	meth->name = name;
+
+	return meth;
+}
+
+GIT_INLINE(void) BIO_meth_free(BIO_METHOD *biom)
+{
+	git__free(biom);
+}
+
+GIT_INLINE(int) BIO_meth_set_write(BIO_METHOD *biom, int (*write) (BIO *, const char *, int))
+{
+	biom->bwrite = write;
+	return 1;
+}
+
+GIT_INLINE(int) BIO_meth_set_read(BIO_METHOD *biom, int (*read) (BIO *, char *, int))
+{
+	biom->bread = read;
+	return 1;
+}
+
+GIT_INLINE(int) BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *))
+{
+	biom->bputs = puts;
+	return 1;
+}
+
+GIT_INLINE(int) BIO_meth_set_gets(BIO_METHOD *biom, int (*gets) (BIO *, char *, int))
+
+{
+	biom->bgets = gets;
+	return 1;
+}
+
+GIT_INLINE(int) BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *))
+{
+	biom->ctrl = ctrl;
+	return 1;
+}
+
+GIT_INLINE(int) BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *))
+{
+	biom->create = create;
+	return 1;
+}
+
+GIT_INLINE(int) BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *))
+{
+	biom->destroy = destroy;
+	return 1;
+}
+
+GIT_INLINE(int) BIO_get_new_index(void)
+{
+	/* This exists as of 1.1 so before we'd just have 0 */
+	return 0;
+}
+
+GIT_INLINE(void) BIO_set_init(BIO *b, int init)
+{
+	b->init = init;
+}
+
+GIT_INLINE(void) BIO_set_data(BIO *a, void *ptr)
+{
+	a->ptr = ptr;
+}
+
+GIT_INLINE(void*) BIO_get_data(BIO *a)
+{
+	return a->ptr;
+}
+
+GIT_INLINE(const unsigned char *) ASN1_STRING_get0_data(const ASN1_STRING *x)
+{
+	return ASN1_STRING_data((ASN1_STRING *)x);
+}
+
+# endif // OpenSSL < 1.1
+#endif // GIT_OPENSSL
+
 #endif

data/vendor/libgit2/src/streams/tls.c

@@ -9,7 +9,6 @@
 
 #include "git2/errors.h"
 
-#include "streams/mbedtls.h"
 #include "streams/openssl.h"
 #include "streams/stransport.h"
 
@@ -32,8 +31,6 @@ int git_tls_stream_new(git_stream **out, const char *host, const char *port)
 	return git_stransport_stream_new(out, host, port);
 #elif defined(GIT_OPENSSL)
 	return git_openssl_stream_new(out, host, port);
-#elif defined(GIT_MBEDTLS)
-	return git_mbedtls_stream_new(out, host, port);
 #else
 	GIT_UNUSED(out);
 	GIT_UNUSED(host);

data/vendor/libgit2/src/submodule.c

@@ -149,66 +149,18 @@ static int find_by_path(const git_config_entry *entry, void *payload)
 	return 0;
 }
 
-/*
- * Checks to see if the submodule shares its name with a file or directory that
- * already exists on the index. If so, the submodule cannot be added.
- */
-static int is_path_occupied(bool *occupied, git_repository *repo, const char *path)
-{
-	int error = 0;
-	git_index *index;
-	git_buf dir = GIT_BUF_INIT;
-	*occupied = false;
-
-	if ((error = git_repository_index__weakptr(&index, repo)) < 0)
-		goto out;
-
-	if ((error = git_index_find(NULL, index, path)) != GIT_ENOTFOUND) {
-		if (!error) {
-			giterr_set(GITERR_SUBMODULE,
-				"File '%s' already exists in the index", path);
-			*occupied = true;
-		}
-		goto out;
-	}
-
-	if ((error = git_buf_sets(&dir, path)) < 0)
-		goto out;
-
-	if ((error = git_path_to_dir(&dir)) < 0)
-		goto out;
-
-	if ((error = git_index_find_prefix(NULL, index, dir.ptr)) != GIT_ENOTFOUND) {
-		if (!error) {
-			giterr_set(GITERR_SUBMODULE,
-				"Directory '%s' already exists in the index", path);
-			*occupied = true;
-		}
-		goto out;
-	}
-
-	error = 0;
-
-out:
-	git_buf_dispose(&dir);
-	return error;
-}
-
 /**
  * Release the name map returned by 'load_submodule_names'.
  */
 static void free_submodule_names(git_strmap *names)
 {
-	git_buf *name;
-
+	git_buf *name = 0;
 	if (names == NULL)
 		return;
-
 	git_strmap_foreach_value(names, name, {
 		git__free(name);
 	});
 	git_strmap_free(names);
-
 	return;
 }
 
@@ -217,30 +169,24 @@ static void free_submodule_names(git_strmap *names)
  * TODO: for some use-cases, this might need case-folding on a
  * case-insensitive filesystem
  */
-static int load_submodule_names(git_strmap **out, git_repository *repo, git_config *cfg)
+static int load_submodule_names(git_strmap *out, git_repository *repo, git_config *cfg)
 {
 	const char *key = "submodule\\..*\\.path";
-	git_config_iterator *iter = NULL;
+	git_config_iterator *iter;
 	git_config_entry *entry;
 	git_buf buf = GIT_BUF_INIT;
-	git_strmap *names;
 	int rval, isvalid;
 	int error = 0;
 
-	*out = NULL;
-
-	if ((error = git_strmap_alloc(&names)) < 0)
-		goto out;
-
 	if ((error = git_config_iterator_glob_new(&iter, cfg, key)) < 0)
-		goto out;
+		return error;
 
-	while (git_config_next(&entry, iter) == 0) {
+	while ((error = git_config_next(&entry, iter)) == 0) {
 		const char *fdot, *ldot;
 		fdot = strchr(entry->name, '.');
 		ldot = strrchr(entry->name, '.');
 
-		if (git_strmap_exists(names, entry->value)) {
+		if (git_strmap_exists(out, entry->value)) {
 			giterr_set(GITERR_SUBMODULE,
 				   "duplicated submodule path '%s'", entry->value);
 			error = -1;
@@ -257,7 +203,7 @@ static int load_submodule_names(git_strmap **out, git_repository *repo, git_conf
 		if (!isvalid)
 			continue;
 
-		git_strmap_insert(names, entry->value, git_buf_detach(&buf), &rval);
+		git_strmap_insert(out, entry->value, git_buf_detach(&buf), &rval);
 		if (rval < 0) {
 			giterr_set(GITERR_NOMEMORY, "error inserting submodule into hash table");
 			return -1;
@@ -266,12 +212,8 @@ static int load_submodule_names(git_strmap **out, git_repository *repo, git_conf
 	if (error == GIT_ITEROVER)
 		error = 0;
 
-	*out = names;
-	names = NULL;
-
 out:
-	free_submodule_names(names);
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 	git_config_iterator_free(iter);
 	return error;
 }
@@ -338,7 +280,7 @@ int git_submodule_lookup(
 
 		if (error < 0) {
 			git_submodule_free(sm);
-			git_buf_dispose(&path);
+			git_buf_free(&path);
 			return error;
 		}
 
@@ -354,7 +296,7 @@ int git_submodule_lookup(
 			}
 		}
 
-		git_buf_dispose(&path);
+		git_buf_free(&path);
 	}
 
 	if ((error = git_submodule_location(&location, sm)) < 0) {
@@ -377,7 +319,7 @@ int git_submodule_lookup(
 			if (git_path_exists(path.ptr))
 				error = GIT_EEXISTS;
 
-			git_buf_dispose(&path);
+			git_buf_free(&path);
 		}
 
 		submodule_set_lookup_error(error, name);
@@ -409,7 +351,7 @@ int git_submodule_name_is_valid(git_repository *repo, const char *name, int flag
 	}
 
 	isvalid =  git_path_isvalid(repo, buf.ptr, 0, flags);
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	return isvalid;
 }
@@ -456,9 +398,10 @@ static int submodules_from_index(git_strmap *map, git_index *idx, git_config *cf
 	int error;
 	git_iterator *i = NULL;
 	const git_index_entry *entry;
-	git_strmap *names;
+	git_strmap *names = 0;
 
-	if ((error = load_submodule_names(&names, git_index_owner(idx), cfg)))
+	git_strmap_alloc(&names);
+	if ((error = load_submodule_names(names, git_index_owner(idx), cfg)))
 		goto done;
 
 	if ((error = git_iterator_for_index(&i, git_index_owner(idx), idx, NULL)) < 0)
@@ -508,9 +451,9 @@ static int submodules_from_head(git_strmap *map, git_tree *head, git_config *cfg
 	int error;
 	git_iterator *i = NULL;
 	const git_index_entry *entry;
-	git_strmap *names;
-
-	if ((error = load_submodule_names(&names, git_tree_owner(head), cfg)))
+	git_strmap *names = 0;
+	git_strmap_alloc(&names);
+	if ((error = load_submodule_names(names, git_tree_owner(head), cfg)))
 		goto done;
 
 	if ((error = git_iterator_for_tree(&i, head, NULL)) < 0)
@@ -572,6 +515,7 @@ int git_submodule__map(git_repository *repo, git_strmap *map)
 	git_buf path = GIT_BUF_INIT;
 	git_submodule *sm;
 	git_config *mods = NULL;
+	uint32_t mask;
 
 	assert(repo && map);
 
@@ -585,6 +529,22 @@ int git_submodule__map(git_repository *repo, git_strmap *map)
 	if (wd && (error = git_buf_joinpath(&path, wd, GIT_MODULES_FILE)) < 0)
 		goto cleanup;
 
+	/* clear submodule flags that are to be refreshed */
+	mask = 0;
+	mask |= GIT_SUBMODULE_STATUS_IN_INDEX |
+		GIT_SUBMODULE_STATUS__INDEX_FLAGS |
+		GIT_SUBMODULE_STATUS__INDEX_OID_VALID |
+		GIT_SUBMODULE_STATUS__INDEX_MULTIPLE_ENTRIES;
+
+	mask |= GIT_SUBMODULE_STATUS_IN_HEAD |
+		GIT_SUBMODULE_STATUS__HEAD_OID_VALID;
+	mask |= GIT_SUBMODULE_STATUS_IN_CONFIG;
+	if (mask != 0)
+		mask |= GIT_SUBMODULE_STATUS_IN_WD |
+			GIT_SUBMODULE_STATUS__WD_SCANNED |
+			GIT_SUBMODULE_STATUS__WD_FLAGS |
+			GIT_SUBMODULE_STATUS__WD_OID_VALID;
+
 	/* add submodule information from .gitmodules */
 	if (wd) {
 		lfc_data data = { 0 };
@@ -613,7 +573,7 @@ int git_submodule__map(git_repository *repo, git_strmap *map)
 			goto cleanup;
 	}
 	/* shallow scan submodules in work tree as needed */
-	if (wd) {
+	if (wd && mask != 0) {
 		git_strmap_foreach_value(map, sm, {
 				submodule_load_from_wd_lite(sm);
 			});
@@ -624,7 +584,7 @@ cleanup:
 	/* TODO: if we got an error, mark submodule config as invalid? */
 	git_index_free(idx);
 	git_tree_free(head);
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 	return error;
 }
 
@@ -729,8 +689,8 @@ static int submodule_repo_init(
 		error = git_repository_init_ext(&subrepo, workdir.ptr, &initopt);
 
 cleanup:
-	git_buf_dispose(&workdir);
-	git_buf_dispose(&repodir);
+	git_buf_free(&workdir);
+	git_buf_free(&repodir);
 
 	*out = subrepo;
 
@@ -749,7 +709,6 @@ int git_submodule_add_setup(
 	git_submodule *sm = NULL;
 	git_buf name = GIT_BUF_INIT, real_url = GIT_BUF_INIT;
 	git_repository *subrepo = NULL;
-	bool path_occupied;
 
 	assert(repo && url && path);
 
@@ -774,14 +733,6 @@ int git_submodule_add_setup(
 		goto cleanup;
 	}
 
-	if ((error = is_path_occupied(&path_occupied, repo, path)) < 0)
-		goto cleanup;
-
-	if (path_occupied) {
-		error = GIT_EEXISTS;
-		goto cleanup;
-	}
-
 	/* update .gitmodules */
 
 	if (!(mods = open_gitmodules(repo, GITMODULES_CREATE))) {
@@ -835,8 +786,8 @@ cleanup:
 
 	git_config_file_free(mods);
 	git_repository_free(subrepo);
-	git_buf_dispose(&real_url);
-	git_buf_dispose(&name);
+	git_buf_free(&real_url);
+	git_buf_free(&name);
 
 	return error;
 }
@@ -865,7 +816,7 @@ int git_submodule_repo_init(
 
 done:
 	git_config_free(cfg);
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 	return error;
 }
 
@@ -949,7 +900,7 @@ int git_submodule_add_to_index(git_submodule *sm, int write_index)
 
 cleanup:
 	git_repository_free(sm_repo);
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 	return error;
 }
 
@@ -1014,7 +965,7 @@ int git_submodule_resolve_url(git_buf *out, git_repository *repo, const char *ur
 		error = -1;
 	}
 
-	git_buf_dispose(&normalized);
+	git_buf_free(&normalized);
 	return error;
 }
 
@@ -1036,7 +987,7 @@ static int write_var(git_repository *repo, const char *name, const char *var, co
 	else
 		error = git_config_file_delete(mods, key.ptr);
 
-	git_buf_dispose(&key);
+	git_buf_free(&key);
 
 cleanup:
 	git_config_file_free(mods);
@@ -1201,8 +1152,8 @@ static int submodule_repo_create(
 	error = git_repository_init_ext(&subrepo, repodir.ptr, &initopt);
 
 cleanup:
-	git_buf_dispose(&workdir);
-	git_buf_dispose(&repodir);
+	git_buf_free(&workdir);
+	git_buf_free(&repodir);
 
 	*out = subrepo;
 
@@ -1355,7 +1306,7 @@ int git_submodule_update(git_submodule *sm, int init, git_submodule_update_optio
 	}
 
 done:
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 	git_config_free(config);
 	git_object_free(target_commit);
 	git_remote_free(remote);
@@ -1402,8 +1353,8 @@ int git_submodule_init(git_submodule *sm, int overwrite)
 
 cleanup:
 	git_config_free(cfg);
-	git_buf_dispose(&key);
-	git_buf_dispose(&effective_submodule_url);
+	git_buf_free(&key);
+	git_buf_free(&effective_submodule_url);
 
 	return error;
 }
@@ -1443,7 +1394,7 @@ int git_submodule_sync(git_submodule *sm)
 		} else {
 			error = git_buf_join3(
 				&key, '.', "remote", remote_name.ptr, "url");
-			git_buf_dispose(&remote_name);
+			git_buf_free(&remote_name);
 		}
 
 		if (!error)
@@ -1452,7 +1403,7 @@ int git_submodule_sync(git_submodule *sm)
 		git_repository_free(smrepo);
 	}
 
-	git_buf_dispose(&key);
+	git_buf_free(&key);
 
 	return error;
 }
@@ -1506,7 +1457,7 @@ static int git_submodule__open(
 			sm->flags |= GIT_SUBMODULE_STATUS__WD_SCANNED;
 	}
 
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	return error;
 }
@@ -1862,6 +1813,14 @@ static int get_value(const char **out, git_config *cfg, git_buf *buf, const char
 	return error;
 }
 
+static bool looks_like_command_line_option(const char *s)
+{
+	if (s && s[0] == '-')
+		return true;
+
+	return false;
+}
+
 static int submodule_read_config(git_submodule *sm, git_config *cfg)
 {
 	git_buf key = GIT_BUF_INIT;
@@ -1875,24 +1834,31 @@ static int submodule_read_config(git_submodule *sm, git_config *cfg)
 
 	if ((error = get_value(&value, cfg, &key, sm->name, "path")) == 0) {
 		in_config = 1;
+		/* We would warn here if we had that API */
+		if (!looks_like_command_line_option(value)) {
 	/*
 	 * TODO: if case insensitive filesystem, then the following strcmp
 	 * should be strcasecmp
 	 */
-		if (strcmp(sm->name, value) != 0) {
-			if (sm->path != sm->name)
-				git__free(sm->path);
-			sm->path = git__strdup(value);
-			GITERR_CHECK_ALLOC(sm->path);
+			if (strcmp(sm->name, value) != 0) {
+				if (sm->path != sm->name)
+					git__free(sm->path);
+				sm->path = git__strdup(value);
+				GITERR_CHECK_ALLOC(sm->path);
+			}
+
 		}
 	} else if (error != GIT_ENOTFOUND) {
 		goto cleanup;
 	}
 
 	if ((error = get_value(&value, cfg, &key, sm->name, "url")) == 0) {
-		in_config = 1;
-		sm->url = git__strdup(value);
-		GITERR_CHECK_ALLOC(sm->url);
+		/* We would warn here if we had that API */
+		if (!looks_like_command_line_option(value)) {
+			in_config = 1;
+			sm->url = git__strdup(value);
+			GITERR_CHECK_ALLOC(sm->url);
+		}
 	} else if (error != GIT_ENOTFOUND) {
 		goto cleanup;
 	}
@@ -1938,7 +1904,7 @@ static int submodule_read_config(git_submodule *sm, git_config *cfg)
 	error = 0;
 
 cleanup:
-	git_buf_dispose(&key);
+	git_buf_free(&key);
 	return error;
 }
 
@@ -2000,7 +1966,7 @@ static int submodule_load_each(const git_config_entry *entry, void *payload)
 	error = 0;
 
 done:
-	git_buf_dispose(&name);
+	git_buf_free(&name);
 	return error;
 }
 
@@ -2017,7 +1983,7 @@ static int submodule_load_from_wd_lite(git_submodule *sm)
 	if (git_path_contains(&path, DOT_GIT))
 		sm->flags |= GIT_SUBMODULE_STATUS_IN_WD;
 
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 	return 0;
 }
 
@@ -2041,7 +2007,6 @@ static int gitmodules_snapshot(git_config **snap, git_repository *repo)
 
 	if ((error = git_config_open_ondisk(&mods, path.ptr)) < 0)
 		goto cleanup;
-	git_buf_dispose(&path);
 
 	if ((error = git_config_snapshot(snap, mods)) < 0)
 		goto cleanup;
@@ -2051,7 +2016,7 @@ static int gitmodules_snapshot(git_config **snap, git_repository *repo)
 cleanup:
 	if (mods)
 		git_config_free(mods);
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	return error;
 }
@@ -2080,7 +2045,7 @@ static git_config_backend *open_gitmodules(
 		}
 	}
 
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	return mods;
 }
@@ -2120,7 +2085,7 @@ static int lookup_head_remote_key(git_buf *remote_name, git_repository *repo)
 		goto done;
 
 done:
-	git_buf_dispose(&upstream_name);
+	git_buf_free(&upstream_name);
 	git_reference_free(head);
 
 	return error;
@@ -2136,7 +2101,7 @@ static int lookup_head_remote(git_remote **remote, git_repository *repo)
 	if (!(error = lookup_head_remote_key(&remote_name, repo)))
 		error = git_remote_lookup(remote, repo, remote_name.ptr);
 
-	git_buf_dispose(&remote_name);
+	git_buf_free(&remote_name);
 
 	return error;
 }