rugged 0.28.3.1 → 0.28.4

data/vendor/libgit2/src/worktree.c

@@ -34,7 +34,7 @@ int git_worktree_list(git_strarray *wts, git_repository *repo)
 	git_vector worktrees = GIT_VECTOR_INIT;
 	git_buf path = GIT_BUF_INIT;
 	char *worktree;
-	unsigned i, len;
+	size_t i, len;
 	int error;
 
 	assert(wts && repo);
@@ -238,21 +238,21 @@ int git_worktree_validate(const git_worktree *wt)
 
 	if (!is_worktree_dir(wt->gitdir_path)) {
 		git_error_set(GIT_ERROR_WORKTREE,
-			"Worktree gitdir ('%s') is not valid",
+			"worktree gitdir ('%s') is not valid",
 			wt->gitlink_path);
 		return GIT_ERROR;
 	}
 
 	if (wt->parent_path && !git_path_exists(wt->parent_path)) {
 		git_error_set(GIT_ERROR_WORKTREE,
-			"Worktree parent directory ('%s') does not exist ",
+			"worktree parent directory ('%s') does not exist ",
 			wt->parent_path);
 		return GIT_ERROR;
 	}
 
 	if (!git_path_exists(wt->commondir_path)) {
 		git_error_set(GIT_ERROR_WORKTREE,
-			"Worktree common directory ('%s') does not exist ",
+			"worktree common directory ('%s') does not exist ",
 			wt->commondir_path);
 		return GIT_ERROR;
 	}
@@ -260,7 +260,7 @@ int git_worktree_validate(const git_worktree *wt)
 	return 0;
 }
 
-int git_worktree_add_init_options(git_worktree_add_options *opts,
+int git_worktree_add_options_init(git_worktree_add_options *opts,
 	unsigned int version)
 {
 	GIT_INIT_STRUCTURE_FROM_TEMPLATE(opts, version,
@@ -268,6 +268,12 @@ int git_worktree_add_init_options(git_worktree_add_options *opts,
 	return 0;
 }
 
+int git_worktree_add_init_options(git_worktree_add_options *opts,
+	unsigned int version)
+{
+	return git_worktree_add_options_init(opts, version);
+}
+
 int git_worktree_add(git_worktree **out, git_repository *repo,
 	const char *name, const char *worktree,
 	const git_worktree_add_options *opts)
@@ -290,6 +296,20 @@ int git_worktree_add(git_worktree **out, git_repository *repo,
 
 	*out = NULL;
 
+	if (wtopts.ref) {
+		if (!git_reference_is_branch(wtopts.ref)) {
+			git_error_set(GIT_ERROR_WORKTREE, "reference is not a branch");
+			err = -1;
+			goto out;
+		}
+
+		if (git_branch_is_checked_out(wtopts.ref)) {
+			git_error_set(GIT_ERROR_WORKTREE, "reference is already checked out");
+			err = -1;
+			goto out;
+		}
+	}
+
 	/* Create gitdir directory ".git/worktrees/<name>" */
 	if ((err = git_buf_joinpath(&gitdir, repo->commondir, "worktrees")) < 0)
 		goto out;
@@ -342,18 +362,6 @@ int git_worktree_add(git_worktree **out, git_repository *repo,
 
 	/* Set up worktree reference */
 	if (wtopts.ref) {
-		if (!git_reference_is_branch(wtopts.ref)) {
-			git_error_set(GIT_ERROR_WORKTREE, "reference is not a branch");
-			err = -1;
-			goto out;
-		}
-
-		if (git_branch_is_checked_out(wtopts.ref)) {
-			git_error_set(GIT_ERROR_WORKTREE, "reference is already checked out");
-			err = -1;
-			goto out;
-		}
-
 		if ((err = git_reference_dup(&ref, wtopts.ref)) < 0)
 			goto out;
 	} else {
@@ -476,7 +484,7 @@ const char *git_worktree_path(const git_worktree *wt)
 	return wt->worktree_path;
 }
 
-int git_worktree_prune_init_options(
+int git_worktree_prune_options_init(
 	git_worktree_prune_options *opts,
 	unsigned int version)
 {
@@ -485,6 +493,12 @@ int git_worktree_prune_init_options(
 	return 0;
 }
 
+int git_worktree_pruneinit_options(git_worktree_prune_options *opts,
+	unsigned int version)
+{
+	return git_worktree_prune_options_init(opts, version);
+}
+
 int git_worktree_is_prunable(git_worktree *wt,
 	git_worktree_prune_options *opts)
 {
@@ -503,7 +517,7 @@ int git_worktree_is_prunable(git_worktree *wt,
 	{
 		if (!reason.size)
 			git_buf_attach_notowned(&reason, "no reason given", 15);
-		git_error_set(GIT_ERROR_WORKTREE, "Not pruning locked working tree: '%s'", reason.ptr);
+		git_error_set(GIT_ERROR_WORKTREE, "not pruning locked working tree: '%s'", reason.ptr);
 		git_buf_dispose(&reason);
 
 		return 0;
@@ -512,7 +526,7 @@ int git_worktree_is_prunable(git_worktree *wt,
 	if ((popts.flags & GIT_WORKTREE_PRUNE_VALID) == 0 &&
 		git_worktree_validate(wt) == 0)
 	{
-		git_error_set(GIT_ERROR_WORKTREE, "Not pruning valid working tree");
+		git_error_set(GIT_ERROR_WORKTREE, "not pruning valid working tree");
 		return 0;
 	}
 
@@ -544,7 +558,7 @@ int git_worktree_prune(git_worktree *wt,
 		goto out;
 	if (!git_path_exists(path.ptr))
 	{
-		git_error_set(GIT_ERROR_WORKTREE, "Worktree gitdir '%s' does not exist", path.ptr);
+		git_error_set(GIT_ERROR_WORKTREE, "worktree gitdir '%s' does not exist", path.ptr);
 		err = -1;
 		goto out;
 	}
@@ -564,7 +578,7 @@ int git_worktree_prune(git_worktree *wt,
 	git_buf_attach(&path, wtpath, 0);
 	if (!git_path_exists(path.ptr))
 	{
-		git_error_set(GIT_ERROR_WORKTREE, "Working tree '%s' does not exist", path.ptr);
+		git_error_set(GIT_ERROR_WORKTREE, "working tree '%s' does not exist", path.ptr);
 		err = -1;
 		goto out;
 	}

data/vendor/libgit2/src/xdiff/xdiffi.c

@@ -36,7 +36,7 @@
 #elif defined(__GNUC__)
 # define XDL_INLINE(type) static __inline__ type
 #else
-#define XDG_INLINE(type) static type
+# define XDL_INLINE(type) static type
 #endif
 
 typedef struct s_xdpsplit {

data/vendor/libgit2/src/xdiff/xmerge.c

@@ -717,10 +717,22 @@ int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
 	status = 0;
 	if (!xscr1) {
 		result->ptr = xdl_malloc(mf2->size);
+		if (!result->ptr) {
+			xdl_free_script(xscr2);
+			xdl_free_env(&xe1);
+			xdl_free_env(&xe2);
+			return -1;
+		}
 		memcpy(result->ptr, mf2->ptr, mf2->size);
 		result->size = mf2->size;
 	} else if (!xscr2) {
 		result->ptr = xdl_malloc(mf1->size);
+		if (!result->ptr) {
+			xdl_free_script(xscr1);
+			xdl_free_env(&xe1);
+			xdl_free_env(&xe2);
+			return -1;
+		}
 		memcpy(result->ptr, mf1->ptr, mf1->size);
 		result->size = mf1->size;
 	} else {

data/vendor/libgit2/src/xdiff/xpatience.c

@@ -217,6 +217,9 @@ static struct entry *find_longest_common_sequence(struct hashmap *map)
 	 */
 	int anchor_i = -1;
 
+	if (!sequence)
+		return NULL;
+
 	for (entry = map->first; entry; entry = entry->next) {
 		if (!entry->line2 || entry->line2 == NON_UNIQUE)
 			continue;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugged
 version: !ruby/object:Gem::Version
-  version: 0.28.3.1
+  version: 0.28.4
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -129,26 +129,76 @@ files:
 - vendor/libgit2/cmake/Modules/EnableWarnings.cmake
 - vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake
 - vendor/libgit2/cmake/Modules/FindGSSAPI.cmake
+- vendor/libgit2/cmake/Modules/FindGSSFramework.cmake
 - vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake
 - vendor/libgit2/cmake/Modules/FindIconv.cmake
+- vendor/libgit2/cmake/Modules/FindPCRE.cmake
+- vendor/libgit2/cmake/Modules/FindPCRE2.cmake
 - vendor/libgit2/cmake/Modules/FindPkgLibraries.cmake
 - vendor/libgit2/cmake/Modules/FindSecurity.cmake
 - vendor/libgit2/cmake/Modules/FindStatNsec.cmake
 - vendor/libgit2/cmake/Modules/FindmbedTLS.cmake
 - vendor/libgit2/cmake/Modules/IdeSplitSources.cmake
+- vendor/libgit2/cmake/Modules/PkgBuildConfig.cmake
+- vendor/libgit2/cmake/Modules/SelectGSSAPI.cmake
+- vendor/libgit2/cmake/Modules/SelectHTTPSBackend.cmake
+- vendor/libgit2/cmake/Modules/SelectHashes.cmake
 - vendor/libgit2/deps/http-parser/CMakeLists.txt
 - vendor/libgit2/deps/http-parser/COPYING
 - vendor/libgit2/deps/http-parser/http_parser.c
 - vendor/libgit2/deps/http-parser/http_parser.h
-- vendor/libgit2/deps/regex/CMakeLists.txt
-- vendor/libgit2/deps/regex/COPYING
-- vendor/libgit2/deps/regex/config.h
-- vendor/libgit2/deps/regex/regcomp.c
-- vendor/libgit2/deps/regex/regex.c
-- vendor/libgit2/deps/regex/regex.h
-- vendor/libgit2/deps/regex/regex_internal.c
-- vendor/libgit2/deps/regex/regex_internal.h
-- vendor/libgit2/deps/regex/regexec.c
+- vendor/libgit2/deps/ntlmclient/CMakeLists.txt
+- vendor/libgit2/deps/ntlmclient/compat.h
+- vendor/libgit2/deps/ntlmclient/crypt.h
+- vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c
+- vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h
+- vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c
+- vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h
+- vendor/libgit2/deps/ntlmclient/crypt_openssl.c
+- vendor/libgit2/deps/ntlmclient/crypt_openssl.h
+- vendor/libgit2/deps/ntlmclient/ntlm.c
+- vendor/libgit2/deps/ntlmclient/ntlm.h
+- vendor/libgit2/deps/ntlmclient/ntlmclient.h
+- vendor/libgit2/deps/ntlmclient/unicode.h
+- vendor/libgit2/deps/ntlmclient/unicode_builtin.c
+- vendor/libgit2/deps/ntlmclient/unicode_iconv.c
+- vendor/libgit2/deps/ntlmclient/utf8.h
+- vendor/libgit2/deps/ntlmclient/util.c
+- vendor/libgit2/deps/ntlmclient/util.h
+- vendor/libgit2/deps/pcre/CMakeLists.txt
+- vendor/libgit2/deps/pcre/COPYING
+- vendor/libgit2/deps/pcre/cmake/COPYING-CMAKE-SCRIPTS
+- vendor/libgit2/deps/pcre/cmake/FindEditline.cmake
+- vendor/libgit2/deps/pcre/cmake/FindPackageHandleStandardArgs.cmake
+- vendor/libgit2/deps/pcre/cmake/FindReadline.cmake
+- vendor/libgit2/deps/pcre/config.h.in
+- vendor/libgit2/deps/pcre/pcre.h
+- vendor/libgit2/deps/pcre/pcre_byte_order.c
+- vendor/libgit2/deps/pcre/pcre_chartables.c
+- vendor/libgit2/deps/pcre/pcre_compile.c
+- vendor/libgit2/deps/pcre/pcre_config.c
+- vendor/libgit2/deps/pcre/pcre_dfa_exec.c
+- vendor/libgit2/deps/pcre/pcre_exec.c
+- vendor/libgit2/deps/pcre/pcre_fullinfo.c
+- vendor/libgit2/deps/pcre/pcre_get.c
+- vendor/libgit2/deps/pcre/pcre_globals.c
+- vendor/libgit2/deps/pcre/pcre_internal.h
+- vendor/libgit2/deps/pcre/pcre_jit_compile.c
+- vendor/libgit2/deps/pcre/pcre_maketables.c
+- vendor/libgit2/deps/pcre/pcre_newline.c
+- vendor/libgit2/deps/pcre/pcre_ord2utf8.c
+- vendor/libgit2/deps/pcre/pcre_printint.c
+- vendor/libgit2/deps/pcre/pcre_refcount.c
+- vendor/libgit2/deps/pcre/pcre_string_utils.c
+- vendor/libgit2/deps/pcre/pcre_study.c
+- vendor/libgit2/deps/pcre/pcre_tables.c
+- vendor/libgit2/deps/pcre/pcre_ucd.c
+- vendor/libgit2/deps/pcre/pcre_valid_utf8.c
+- vendor/libgit2/deps/pcre/pcre_version.c
+- vendor/libgit2/deps/pcre/pcre_xclass.c
+- vendor/libgit2/deps/pcre/pcreposix.c
+- vendor/libgit2/deps/pcre/pcreposix.h
+- vendor/libgit2/deps/pcre/ucp.h
 - vendor/libgit2/deps/winhttp/CMakeLists.txt
 - vendor/libgit2/deps/winhttp/COPYING.GPL
 - vendor/libgit2/deps/winhttp/COPYING.LGPL
@@ -186,12 +236,14 @@ files:
 - vendor/libgit2/include/git2/blob.h
 - vendor/libgit2/include/git2/branch.h
 - vendor/libgit2/include/git2/buffer.h
+- vendor/libgit2/include/git2/cert.h
 - vendor/libgit2/include/git2/checkout.h
 - vendor/libgit2/include/git2/cherrypick.h
 - vendor/libgit2/include/git2/clone.h
 - vendor/libgit2/include/git2/commit.h
 - vendor/libgit2/include/git2/common.h
 - vendor/libgit2/include/git2/config.h
+- vendor/libgit2/include/git2/cred.h
 - vendor/libgit2/include/git2/cred_helpers.h
 - vendor/libgit2/include/git2/deprecated.h
 - vendor/libgit2/include/git2/describe.h
@@ -203,7 +255,6 @@ files:
 - vendor/libgit2/include/git2/ignore.h
 - vendor/libgit2/include/git2/index.h
 - vendor/libgit2/include/git2/indexer.h
-- vendor/libgit2/include/git2/inttypes.h
 - vendor/libgit2/include/git2/mailmap.h
 - vendor/libgit2/include/git2/merge.h
 - vendor/libgit2/include/git2/message.h
@@ -238,6 +289,7 @@ files:
 - vendor/libgit2/include/git2/sys/alloc.h
 - vendor/libgit2/include/git2/sys/commit.h
 - vendor/libgit2/include/git2/sys/config.h
+- vendor/libgit2/include/git2/sys/cred.h
 - vendor/libgit2/include/git2/sys/diff.h
 - vendor/libgit2/include/git2/sys/filter.h
 - vendor/libgit2/include/git2/sys/hashsig.h
@@ -252,7 +304,6 @@ files:
 - vendor/libgit2/include/git2/sys/refs.h
 - vendor/libgit2/include/git2/sys/repository.h
 - vendor/libgit2/include/git2/sys/stream.h
-- vendor/libgit2/include/git2/sys/time.h
 - vendor/libgit2/include/git2/sys/transport.h
 - vendor/libgit2/include/git2/tag.h
 - vendor/libgit2/include/git2/trace.h
@@ -262,10 +313,13 @@ files:
 - vendor/libgit2/include/git2/types.h
 - vendor/libgit2/include/git2/version.h
 - vendor/libgit2/include/git2/worktree.h
-- vendor/libgit2/libgit2.pc.in
 - vendor/libgit2/src/CMakeLists.txt
 - vendor/libgit2/src/alloc.c
 - vendor/libgit2/src/alloc.h
+- vendor/libgit2/src/allocators/stdalloc.c
+- vendor/libgit2/src/allocators/stdalloc.h
+- vendor/libgit2/src/allocators/win32_crtdbg.c
+- vendor/libgit2/src/allocators/win32_crtdbg.h
 - vendor/libgit2/src/annotated_commit.c
 - vendor/libgit2/src/annotated_commit.h
 - vendor/libgit2/src/apply.c
@@ -313,6 +367,7 @@ files:
 - vendor/libgit2/src/config_mem.c
 - vendor/libgit2/src/config_parse.c
 - vendor/libgit2/src/config_parse.h
+- vendor/libgit2/src/config_snapshot.c
 - vendor/libgit2/src/crlf.c
 - vendor/libgit2/src/date.c
 - vendor/libgit2/src/delta.c
@@ -335,6 +390,7 @@ files:
 - vendor/libgit2/src/diff_xdiff.c
 - vendor/libgit2/src/diff_xdiff.h
 - vendor/libgit2/src/errors.c
+- vendor/libgit2/src/errors.h
 - vendor/libgit2/src/features.h.in
 - vendor/libgit2/src/fetch.c
 - vendor/libgit2/src/fetch.h
@@ -342,30 +398,32 @@ files:
 - vendor/libgit2/src/fetchhead.h
 - vendor/libgit2/src/filebuf.c
 - vendor/libgit2/src/filebuf.h
-- vendor/libgit2/src/fileops.c
-- vendor/libgit2/src/fileops.h
 - vendor/libgit2/src/filter.c
 - vendor/libgit2/src/filter.h
-- vendor/libgit2/src/fnmatch.c
-- vendor/libgit2/src/fnmatch.h
+- vendor/libgit2/src/futils.c
+- vendor/libgit2/src/futils.h
 - vendor/libgit2/src/global.c
 - vendor/libgit2/src/global.h
 - vendor/libgit2/src/graph.c
 - vendor/libgit2/src/hash.c
 - vendor/libgit2/src/hash.h
-- vendor/libgit2/src/hash/hash_collisiondetect.h
-- vendor/libgit2/src/hash/hash_common_crypto.h
-- vendor/libgit2/src/hash/hash_generic.c
-- vendor/libgit2/src/hash/hash_generic.h
-- vendor/libgit2/src/hash/hash_mbedtls.c
-- vendor/libgit2/src/hash/hash_mbedtls.h
-- vendor/libgit2/src/hash/hash_openssl.h
-- vendor/libgit2/src/hash/hash_win32.c
-- vendor/libgit2/src/hash/hash_win32.h
-- vendor/libgit2/src/hash/sha1dc/sha1.c
-- vendor/libgit2/src/hash/sha1dc/sha1.h
-- vendor/libgit2/src/hash/sha1dc/ubc_check.c
-- vendor/libgit2/src/hash/sha1dc/ubc_check.h
+- vendor/libgit2/src/hash/sha1.h
+- vendor/libgit2/src/hash/sha1/collisiondetect.c
+- vendor/libgit2/src/hash/sha1/collisiondetect.h
+- vendor/libgit2/src/hash/sha1/common_crypto.c
+- vendor/libgit2/src/hash/sha1/common_crypto.h
+- vendor/libgit2/src/hash/sha1/generic.c
+- vendor/libgit2/src/hash/sha1/generic.h
+- vendor/libgit2/src/hash/sha1/mbedtls.c
+- vendor/libgit2/src/hash/sha1/mbedtls.h
+- vendor/libgit2/src/hash/sha1/openssl.c
+- vendor/libgit2/src/hash/sha1/openssl.h
+- vendor/libgit2/src/hash/sha1/sha1dc/sha1.c
+- vendor/libgit2/src/hash/sha1/sha1dc/sha1.h
+- vendor/libgit2/src/hash/sha1/sha1dc/ubc_check.c
+- vendor/libgit2/src/hash/sha1/sha1dc/ubc_check.h
+- vendor/libgit2/src/hash/sha1/win32.c
+- vendor/libgit2/src/hash/sha1/win32.h
 - vendor/libgit2/src/hashsig.c
 - vendor/libgit2/src/ident.c
 - vendor/libgit2/src/idxmap.c
@@ -392,6 +450,8 @@ files:
 - vendor/libgit2/src/message.h
 - vendor/libgit2/src/mwindow.c
 - vendor/libgit2/src/mwindow.h
+- vendor/libgit2/src/net.c
+- vendor/libgit2/src/net.h
 - vendor/libgit2/src/netops.c
 - vendor/libgit2/src/netops.h
 - vendor/libgit2/src/notes.c
@@ -451,6 +511,8 @@ files:
 - vendor/libgit2/src/refs.h
 - vendor/libgit2/src/refspec.c
 - vendor/libgit2/src/refspec.h
+- vendor/libgit2/src/regexp.c
+- vendor/libgit2/src/regexp.h
 - vendor/libgit2/src/remote.c
 - vendor/libgit2/src/remote.h
 - vendor/libgit2/src/repo_template.h
@@ -471,8 +533,6 @@ files:
 - vendor/libgit2/src/stash.c
 - vendor/libgit2/src/status.c
 - vendor/libgit2/src/status.h
-- vendor/libgit2/src/stdalloc.c
-- vendor/libgit2/src/stdalloc.h
 - vendor/libgit2/src/stream.h
 - vendor/libgit2/src/streams/mbedtls.c
 - vendor/libgit2/src/streams/mbedtls.h
@@ -507,8 +567,9 @@ files:
 - vendor/libgit2/src/transports/auth.h
 - vendor/libgit2/src/transports/auth_negotiate.c
 - vendor/libgit2/src/transports/auth_negotiate.h
+- vendor/libgit2/src/transports/auth_ntlm.c
+- vendor/libgit2/src/transports/auth_ntlm.h
 - vendor/libgit2/src/transports/cred.c
-- vendor/libgit2/src/transports/cred.h
 - vendor/libgit2/src/transports/cred_helpers.c
 - vendor/libgit2/src/transports/git.c
 - vendor/libgit2/src/transports/http.c
@@ -537,6 +598,8 @@ files:
 - vendor/libgit2/src/varint.h
 - vendor/libgit2/src/vector.c
 - vendor/libgit2/src/vector.h
+- vendor/libgit2/src/wildmatch.c
+- vendor/libgit2/src/wildmatch.h
 - vendor/libgit2/src/win32/dir.c
 - vendor/libgit2/src/win32/dir.h
 - vendor/libgit2/src/win32/error.c
@@ -561,6 +624,7 @@ files:
 - vendor/libgit2/src/win32/version.h
 - vendor/libgit2/src/win32/w32_buffer.c
 - vendor/libgit2/src/win32/w32_buffer.h
+- vendor/libgit2/src/win32/w32_common.h
 - vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c
 - vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h
 - vendor/libgit2/src/win32/w32_stack.c