rugged 1.1.0 → 1.2.0

data/vendor/libgit2/src/worktree.c

@@ -37,12 +37,13 @@ int git_worktree_list(git_strarray *wts, git_repository *repo)
 	size_t i, len;
 	int error;
 
-	assert(wts && repo);
+	GIT_ASSERT_ARG(wts);
+	GIT_ASSERT_ARG(repo);
 
 	wts->count = 0;
 	wts->strings = NULL;
 
-	if ((error = git_buf_printf(&path, "%s/worktrees/", repo->commondir)) < 0)
+	if ((error = git_buf_joinpath(&path, repo->commondir, "worktrees/")) < 0)
 		goto exit;
 	if (!git_path_exists(path.ptr) || git_path_is_empty_dir(path.ptr))
 		goto exit;
@@ -73,7 +74,8 @@ char *git_worktree__read_link(const char *base, const char *file)
 {
 	git_buf path = GIT_BUF_INIT, buf = GIT_BUF_INIT;
 
-	assert(base && file);
+	GIT_ASSERT_ARG_WITH_RETVAL(base, NULL);
+	GIT_ASSERT_ARG_WITH_RETVAL(file, NULL);
 
 	if (git_buf_joinpath(&path, base, file) < 0)
 		goto err;
@@ -106,7 +108,9 @@ static int write_wtfile(const char *base, const char *file, const git_buf *buf)
 	git_buf path = GIT_BUF_INIT;
 	int err;
 
-	assert(base && file && buf);
+	GIT_ASSERT_ARG(base);
+	GIT_ASSERT_ARG(file);
+	GIT_ASSERT_ARG(buf);
 
 	if ((err = git_buf_joinpath(&path, base, file)) < 0)
 		goto out;
@@ -131,6 +135,9 @@ static int open_worktree_dir(git_worktree **out, const char *parent, const char
 		goto out;
 	}
 
+	if ((error = git_path_validate_workdir(NULL, dir)) < 0)
+		goto out;
+
 	if ((wt = git__calloc(1, sizeof(*wt))) == NULL) {
 		error = -1;
 		goto out;
@@ -170,11 +177,12 @@ int git_worktree_lookup(git_worktree **out, git_repository *repo, const char *na
 	git_worktree *wt = NULL;
 	int error;
 
-	assert(repo && name);
+	GIT_ASSERT_ARG(repo);
+	GIT_ASSERT_ARG(name);
 
 	*out = NULL;
 
-	if ((error = git_buf_printf(&path, "%s/worktrees/%s", repo->commondir, name)) < 0)
+	if ((error = git_buf_join3(&path, '/', repo->commondir, "worktrees", name)) < 0)
 		goto out;
 
 	if ((error = (open_worktree_dir(out, git_repository_workdir(repo), path.ptr, name))) < 0)
@@ -237,7 +245,7 @@ void git_worktree_free(git_worktree *wt)
 
 int git_worktree_validate(const git_worktree *wt)
 {
-	assert(wt);
+	GIT_ASSERT_ARG(wt);
 
 	if (!is_worktree_dir(wt->gitdir_path)) {
 		git_error_set(GIT_ERROR_WORKTREE,
@@ -260,6 +268,13 @@ int git_worktree_validate(const git_worktree *wt)
 		return GIT_ERROR;
 	}
 
+	if (!git_path_exists(wt->worktree_path)) {
+		git_error_set(GIT_ERROR_WORKTREE,
+			"worktree directory '%s' does not exist",
+			wt->worktree_path);
+		return GIT_ERROR;
+	}
+
 	return 0;
 }
 
@@ -297,7 +312,10 @@ int git_worktree_add(git_worktree **out, git_repository *repo,
 	if (opts)
 		memcpy(&wtopts, opts, sizeof(wtopts));
 
-	assert(out && repo && name && worktree);
+	GIT_ASSERT_ARG(out);
+	GIT_ASSERT_ARG(repo);
+	GIT_ASSERT_ARG(name);
+	GIT_ASSERT_ARG(worktree);
 
 	*out = NULL;
 
@@ -410,7 +428,7 @@ int git_worktree_lock(git_worktree *wt, const char *reason)
 	git_buf buf = GIT_BUF_INIT, path = GIT_BUF_INIT;
 	int error;
 
-	assert(wt);
+	GIT_ASSERT_ARG(wt);
 
 	if ((error = git_worktree_is_locked(NULL, wt)) < 0)
 		goto out;
@@ -441,7 +459,7 @@ int git_worktree_unlock(git_worktree *wt)
 	git_buf path = GIT_BUF_INIT;
 	int error;
 
-	assert(wt);
+	GIT_ASSERT_ARG(wt);
 
 	if ((error = git_worktree_is_locked(NULL, wt)) < 0)
 		return error;
@@ -468,7 +486,7 @@ int git_worktree_is_locked(git_buf *reason, const git_worktree *wt)
 	git_buf path = GIT_BUF_INIT;
 	int error, locked;
 
-	assert(wt);
+	GIT_ASSERT_ARG(wt);
 
 	if (reason)
 		git_buf_clear(reason);
@@ -489,13 +507,13 @@ out:
 
 const char *git_worktree_name(const git_worktree *wt)
 {
-	assert(wt);
+	GIT_ASSERT_ARG_WITH_RETVAL(wt, NULL);
 	return wt->name;
 }
 
 const char *git_worktree_path(const git_worktree *wt)
 {
-	assert(wt);
+	GIT_ASSERT_ARG_WITH_RETVAL(wt, NULL);
 	return wt->worktree_path;
 }
 
@@ -574,7 +592,7 @@ int git_worktree_prune(git_worktree *wt,
 	}
 
 	/* Delete gitdir in parent repository */
-	if ((err = git_buf_printf(&path, "%s/worktrees/%s", wt->commondir_path, wt->name)) < 0)
+	if ((err = git_buf_join3(&path, '/', wt->commondir_path, "worktrees", wt->name)) < 0)
 		goto out;
 	if (!git_path_exists(path.ptr))
 	{

data/vendor/libgit2/src/zstream.c

@@ -156,7 +156,7 @@ int git_zstream_get_output(void *out, size_t *out_len, git_zstream *zstream)
 	}
 
 	/* either we finished the input or we did not flush the data */
-	assert(zstream->in_len > 0 || zstream->flush == Z_FINISH);
+	GIT_ASSERT(zstream->in_len > 0 || zstream->flush == Z_FINISH);
 
 	/* set out_size to number of bytes actually written to output */
 	*out_len = *out_len - out_remain;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugged
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -135,6 +135,7 @@ files:
 - vendor/libgit2/cmake/FindPkgLibraries.cmake
 - vendor/libgit2/cmake/FindSecurity.cmake
 - vendor/libgit2/cmake/FindStatNsec.cmake
+- vendor/libgit2/cmake/Findfutimens.cmake
 - vendor/libgit2/cmake/FindmbedTLS.cmake
 - vendor/libgit2/cmake/IdeSplitSources.cmake
 - vendor/libgit2/cmake/PkgBuildConfig.cmake
@@ -142,6 +143,7 @@ files:
 - vendor/libgit2/cmake/SelectGSSAPI.cmake
 - vendor/libgit2/cmake/SelectHTTPSBackend.cmake
 - vendor/libgit2/cmake/SelectHashes.cmake
+- vendor/libgit2/deps/chromium-zlib/CMakeLists.txt
 - vendor/libgit2/deps/http-parser/CMakeLists.txt
 - vendor/libgit2/deps/http-parser/COPYING
 - vendor/libgit2/deps/http-parser/http_parser.c
@@ -160,7 +162,9 @@ files:
 - vendor/libgit2/deps/ntlmclient/ntlmclient.h
 - vendor/libgit2/deps/ntlmclient/unicode.h
 - vendor/libgit2/deps/ntlmclient/unicode_builtin.c
+- vendor/libgit2/deps/ntlmclient/unicode_builtin.h
 - vendor/libgit2/deps/ntlmclient/unicode_iconv.c
+- vendor/libgit2/deps/ntlmclient/unicode_iconv.h
 - vendor/libgit2/deps/ntlmclient/utf8.h
 - vendor/libgit2/deps/ntlmclient/util.c
 - vendor/libgit2/deps/ntlmclient/util.h
@@ -289,6 +293,7 @@ files:
 - vendor/libgit2/include/git2/submodule.h
 - vendor/libgit2/include/git2/sys/alloc.h
 - vendor/libgit2/include/git2/sys/commit.h
+- vendor/libgit2/include/git2/sys/commit_graph.h
 - vendor/libgit2/include/git2/sys/config.h
 - vendor/libgit2/include/git2/sys/cred.h
 - vendor/libgit2/include/git2/sys/credential.h
@@ -298,6 +303,7 @@ files:
 - vendor/libgit2/include/git2/sys/index.h
 - vendor/libgit2/include/git2/sys/mempack.h
 - vendor/libgit2/include/git2/sys/merge.h
+- vendor/libgit2/include/git2/sys/midx.h
 - vendor/libgit2/include/git2/sys/odb_backend.h
 - vendor/libgit2/include/git2/sys/openssl.h
 - vendor/libgit2/include/git2/sys/path.h
@@ -318,10 +324,12 @@ files:
 - vendor/libgit2/src/CMakeLists.txt
 - vendor/libgit2/src/alloc.c
 - vendor/libgit2/src/alloc.h
+- vendor/libgit2/src/allocators/failalloc.c
+- vendor/libgit2/src/allocators/failalloc.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/allocators/win32_leakcheck.c
+- vendor/libgit2/src/allocators/win32_leakcheck.h
 - vendor/libgit2/src/annotated_commit.c
 - vendor/libgit2/src/annotated_commit.h
 - vendor/libgit2/src/apply.c
@@ -343,8 +351,6 @@ files:
 - vendor/libgit2/src/blob.h
 - vendor/libgit2/src/branch.c
 - vendor/libgit2/src/branch.h
-- vendor/libgit2/src/buf_text.c
-- vendor/libgit2/src/buf_text.h
 - vendor/libgit2/src/buffer.c
 - vendor/libgit2/src/buffer.h
 - vendor/libgit2/src/cache.c
@@ -357,6 +363,8 @@ files:
 - vendor/libgit2/src/clone.h
 - vendor/libgit2/src/commit.c
 - vendor/libgit2/src/commit.h
+- vendor/libgit2/src/commit_graph.c
+- vendor/libgit2/src/commit_graph.h
 - vendor/libgit2/src/commit_list.c
 - vendor/libgit2/src/commit_list.h
 - vendor/libgit2/src/common.h
@@ -405,8 +413,6 @@ files:
 - vendor/libgit2/src/filter.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
@@ -441,6 +447,8 @@ files:
 - vendor/libgit2/src/iterator.c
 - vendor/libgit2/src/iterator.h
 - vendor/libgit2/src/khash.h
+- vendor/libgit2/src/libgit2.c
+- vendor/libgit2/src/libgit2.h
 - vendor/libgit2/src/mailmap.c
 - vendor/libgit2/src/mailmap.h
 - vendor/libgit2/src/map.h
@@ -527,7 +535,9 @@ files:
 - vendor/libgit2/src/revparse.c
 - vendor/libgit2/src/revwalk.c
 - vendor/libgit2/src/revwalk.h
-- vendor/libgit2/src/settings.c
+- vendor/libgit2/src/runtime.c
+- vendor/libgit2/src/runtime.h
+- vendor/libgit2/src/settings.h
 - vendor/libgit2/src/signature.c
 - vendor/libgit2/src/signature.h
 - vendor/libgit2/src/sortedcache.c
@@ -541,6 +551,10 @@ files:
 - vendor/libgit2/src/streams/mbedtls.h
 - vendor/libgit2/src/streams/openssl.c
 - vendor/libgit2/src/streams/openssl.h
+- vendor/libgit2/src/streams/openssl_dynamic.c
+- vendor/libgit2/src/streams/openssl_dynamic.h
+- vendor/libgit2/src/streams/openssl_legacy.c
+- vendor/libgit2/src/streams/openssl_legacy.h
 - vendor/libgit2/src/streams/registry.c
 - vendor/libgit2/src/streams/registry.h
 - vendor/libgit2/src/streams/socket.c
@@ -558,8 +572,10 @@ files:
 - vendor/libgit2/src/sysdir.h
 - vendor/libgit2/src/tag.c
 - vendor/libgit2/src/tag.h
-- vendor/libgit2/src/thread-utils.c
-- vendor/libgit2/src/thread-utils.h
+- vendor/libgit2/src/thread.c
+- vendor/libgit2/src/thread.h
+- vendor/libgit2/src/threadstate.c
+- vendor/libgit2/src/threadstate.h
 - vendor/libgit2/src/trace.c
 - vendor/libgit2/src/trace.h
 - vendor/libgit2/src/trailer.c
@@ -597,6 +613,8 @@ files:
 - vendor/libgit2/src/unix/pthread.h
 - vendor/libgit2/src/unix/realpath.c
 - vendor/libgit2/src/userdiff.h
+- vendor/libgit2/src/utf8.c
+- vendor/libgit2/src/utf8.h
 - vendor/libgit2/src/util.c
 - vendor/libgit2/src/util.h
 - vendor/libgit2/src/varint.c
@@ -630,10 +648,8 @@ files:
 - 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
-- vendor/libgit2/src/win32/w32_stack.h
+- vendor/libgit2/src/win32/w32_leakcheck.c
+- vendor/libgit2/src/win32/w32_leakcheck.h
 - vendor/libgit2/src/win32/w32_util.c
 - vendor/libgit2/src/win32/w32_util.h
 - vendor/libgit2/src/win32/win32-compat.h
@@ -660,7 +676,7 @@ homepage: https://github.com/libgit2/rugged
 licenses:
 - MIT
 metadata:
-  msys2_mingw_dependencies: libssh2
+  msys2_mingw_dependencies: libssh2 cmake
 post_install_message: 
 rdoc_options: []
 require_paths:

data/vendor/libgit2/src/allocators/win32_crtdbg.c

@@ -1,118 +0,0 @@
-/*
- * Copyright (C) the libgit2 contributors. All rights reserved.
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-
-#include "win32_crtdbg.h"
-
-#if defined(GIT_MSVC_CRTDBG)
-
-#include "win32/w32_crtdbg_stacktrace.h"
-
-static void *crtdbg__malloc(size_t len, const char *file, int line)
-{
-	void *ptr = _malloc_dbg(len, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
-	if (!ptr) git_error_set_oom();
-	return ptr;
-}
-
-static void *crtdbg__calloc(size_t nelem, size_t elsize, const char *file, int line)
-{
-	void *ptr = _calloc_dbg(nelem, elsize, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
-	if (!ptr) git_error_set_oom();
-	return ptr;
-}
-
-static char *crtdbg__strdup(const char *str, const char *file, int line)
-{
-	char *ptr = _strdup_dbg(str, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
-	if (!ptr) git_error_set_oom();
-	return ptr;
-}
-
-static char *crtdbg__strndup(const char *str, size_t n, const char *file, int line)
-{
-	size_t length = 0, alloclength;
-	char *ptr;
-
-	length = p_strnlen(str, n);
-
-	if (GIT_ADD_SIZET_OVERFLOW(&alloclength, length, 1) ||
-		!(ptr = crtdbg__malloc(alloclength, file, line)))
-		return NULL;
-
-	if (length)
-		memcpy(ptr, str, length);
-
-	ptr[length] = '\0';
-
-	return ptr;
-}
-
-static char *crtdbg__substrdup(const char *start, size_t n, const char *file, int line)
-{
-	char *ptr;
-	size_t alloclen;
-
-	if (GIT_ADD_SIZET_OVERFLOW(&alloclen, n, 1) ||
-		!(ptr = crtdbg__malloc(alloclen, file, line)))
-		return NULL;
-
-	memcpy(ptr, start, n);
-	ptr[n] = '\0';
-	return ptr;
-}
-
-static void *crtdbg__realloc(void *ptr, size_t size, const char *file, int line)
-{
-	void *new_ptr = _realloc_dbg(ptr, size, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
-	if (!new_ptr) git_error_set_oom();
-	return new_ptr;
-}
-
-static void *crtdbg__reallocarray(void *ptr, size_t nelem, size_t elsize, const char *file, int line)
-{
-	size_t newsize;
-
-	if (GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize))
-		return NULL;
-
-	return crtdbg__realloc(ptr, newsize, file, line);
-}
-
-static void *crtdbg__mallocarray(size_t nelem, size_t elsize, const char *file, int line)
-{
-	return crtdbg__reallocarray(NULL, nelem, elsize, file, line);
-}
-
-static void crtdbg__free(void *ptr)
-{
-	free(ptr);
-}
-
-int git_win32_crtdbg_init_allocator(git_allocator *allocator)
-{
-	allocator->gmalloc = crtdbg__malloc;
-	allocator->gcalloc = crtdbg__calloc;
-	allocator->gstrdup = crtdbg__strdup;
-	allocator->gstrndup = crtdbg__strndup;
-	allocator->gsubstrdup = crtdbg__substrdup;
-	allocator->grealloc = crtdbg__realloc;
-	allocator->greallocarray = crtdbg__reallocarray;
-	allocator->gmallocarray = crtdbg__mallocarray;
-	allocator->gfree = crtdbg__free;
-	return 0;
-}
-
-#else
-
-int git_win32_crtdbg_init_allocator(git_allocator *allocator)
-{
-	GIT_UNUSED(allocator);
-	git_error_set(GIT_EINVALID, "crtdbg memory allocator not available");
-	return -1;
-}
-
-#endif