rugged 0.27.5 → 0.27.7

data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h

@@ -17,6 +17,34 @@
 #include "git2/errors.h"
 #include "strnlen.h"
 
+/* MSVC CRTDBG memory leak reporting.
+ *
+ * We DO NOT use the "_CRTDBG_MAP_ALLOC" macro described in the MSVC
+ * documentation because all allocs/frees in libgit2 already go through
+ * the "git__" routines defined in this file.  Simply using the normal
+ * reporting mechanism causes all leaks to be attributed to a routine
+ * here in util.h (ie, the actual call to calloc()) rather than the
+ * caller of git__calloc().
+ *
+ * Therefore, we declare a set of "git__crtdbg__" routines to replace
+ * the corresponding "git__" routines and re-define the "git__" symbols
+ * as macros.  This allows us to get and report the file:line info of
+ * the real caller.
+ *
+ * We DO NOT replace the "git__free" routine because it needs to remain
+ * a function pointer because it is used as a function argument when
+ * setting up various structure "destructors".
+ *
+ * We also DO NOT use the "_CRTDBG_MAP_ALLOC" macro because it causes
+ * "free" to be remapped to "_free_dbg" and this causes problems for
+ * structures which define a field named "free".
+ *
+ * Finally, CRTDBG must be explicitly enabled and configured at program
+ * startup.  See tests/main.c for an example.
+ */
+
+int git_win32_crtdbg_init_allocator(git_allocator *allocator);
+
 /**
  * Initialize our memory leak tracking and de-dup data structures.
  * This should ONLY be called by git_libgit2_init().
@@ -97,80 +125,5 @@ GIT_EXTERN(int) git_win32__crtdbg_stacktrace__dump(
  */
 const char *git_win32__crtdbg_stacktrace(int skip, const char *file);
 
-GIT_INLINE(void *) git__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) giterr_set_oom();
-	return ptr;
-}
-
-GIT_INLINE(void *) git__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) giterr_set_oom();
-	return ptr;
-}
-
-GIT_INLINE(char *) git__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) giterr_set_oom();
-	return ptr;
-}
-
-GIT_INLINE(char *) git__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 = git__crtdbg__malloc(alloclength, file, line)))
-		return NULL;
-
-	if (length)
-		memcpy(ptr, str, length);
-
-	ptr[length] = '\0';
-
-	return ptr;
-}
-
-GIT_INLINE(char *) git__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 = git__crtdbg__malloc(alloclen, file, line)))
-		return NULL;
-
-	memcpy(ptr, start, n);
-	ptr[n] = '\0';
-	return ptr;
-}
-
-GIT_INLINE(void *) git__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) giterr_set_oom();
-	return new_ptr;
-}
-
-GIT_INLINE(void *) git__crtdbg__reallocarray(void *ptr, size_t nelem, size_t elsize, const char *file, int line)
-{
-	size_t newsize;
-
-	return GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize) ?
-		NULL : _realloc_dbg(ptr, newsize, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
-}
-
-GIT_INLINE(void *) git__crtdbg__mallocarray(size_t nelem, size_t elsize, const char *file, int line)
-{
-	return git__crtdbg__reallocarray(NULL, nelem, elsize, file, line);
-}
-
-
 #endif
 #endif

data/vendor/libgit2/src/worktree.c

@@ -25,7 +25,7 @@ static bool is_worktree_dir(const char *dir)
 		&& git_path_contains_file(&buf, "gitdir")
 		&& git_path_contains_file(&buf, "HEAD");
 
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 	return error;
 }
 
@@ -64,7 +64,7 @@ int git_worktree_list(git_strarray *wts, git_repository *repo)
 	wts->strings = (char **)git_vector_detach(&wts->count, NULL, &worktrees);
 
 exit:
-	git_buf_free(&path);
+	git_buf_dispose(&path);
 
 	return error;
 }
@@ -79,7 +79,7 @@ char *git_worktree__read_link(const char *base, const char *file)
 		goto err;
 	if (git_futils_readbuffer(&buf, path.ptr) < 0)
 		goto err;
-	git_buf_free(&path);
+	git_buf_dispose(&path);
 
 	git_buf_rtrim(&buf);
 
@@ -90,13 +90,13 @@ char *git_worktree__read_link(const char *base, const char *file)
 		goto err;
 	if (git_path_apply_relative(&path, buf.ptr) < 0)
 		goto err;
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 
 	return git_buf_detach(&path);
 
 err:
-	git_buf_free(&buf);
-	git_buf_free(&path);
+	git_buf_dispose(&buf);
+	git_buf_dispose(&path);
 
 	return NULL;
 }
@@ -115,7 +115,7 @@ static int write_wtfile(const char *base, const char *file, const git_buf *buf)
 		goto out;
 
 out:
-	git_buf_free(&path);
+	git_buf_dispose(&path);
 
 	return err;
 }
@@ -139,7 +139,8 @@ static int open_worktree_dir(git_worktree **out, const char *parent, const char
 	if ((wt->name = git__strdup(name)) == NULL
 	    || (wt->commondir_path = git_worktree__read_link(dir, "commondir")) == NULL
 	    || (wt->gitlink_path = git_worktree__read_link(dir, "gitdir")) == NULL
-	    || (wt->parent_path = git__strdup(parent)) == NULL) {
+	    || (parent && (wt->parent_path = git__strdup(parent)) == NULL)
+	    || (wt->worktree_path = git_path_dirname(wt->gitlink_path)) == NULL) {
 		error = -1;
 		goto out;
 	}
@@ -155,7 +156,7 @@ static int open_worktree_dir(git_worktree **out, const char *parent, const char
 out:
 	if (error)
 		git_worktree_free(wt);
-	git_buf_free(&gitdir);
+	git_buf_dispose(&gitdir);
 
 	return error;
 }
@@ -177,7 +178,7 @@ int git_worktree_lookup(git_worktree **out, git_repository *repo, const char *na
 		goto out;
 
 out:
-	git_buf_free(&path);
+	git_buf_dispose(&path);
 
 	if (error)
 		git_worktree_free(wt);
@@ -212,7 +213,7 @@ int git_worktree_open_from_repository(git_worktree **out, git_repository *repo)
 
 out:
 	git__free(name);
-	git_buf_free(&parent);
+	git_buf_dispose(&parent);
 
 	return error;
 }
@@ -223,6 +224,7 @@ void git_worktree_free(git_worktree *wt)
 		return;
 
 	git__free(wt->commondir_path);
+	git__free(wt->worktree_path);
 	git__free(wt->gitlink_path);
 	git__free(wt->gitdir_path);
 	git__free(wt->parent_path);
@@ -232,40 +234,30 @@ void git_worktree_free(git_worktree *wt)
 
 int git_worktree_validate(const git_worktree *wt)
 {
-	git_buf buf = GIT_BUF_INIT;
-	int err = 0;
-
 	assert(wt);
 
-	git_buf_puts(&buf, wt->gitdir_path);
-	if (!is_worktree_dir(buf.ptr)) {
+	if (!is_worktree_dir(wt->gitdir_path)) {
 		giterr_set(GITERR_WORKTREE,
 			"Worktree gitdir ('%s') is not valid",
 			wt->gitlink_path);
-		err = -1;
-		goto out;
+		return GIT_ERROR;
 	}
 
-	if (!git_path_exists(wt->parent_path)) {
+	if (wt->parent_path && !git_path_exists(wt->parent_path)) {
 		giterr_set(GITERR_WORKTREE,
 			"Worktree parent directory ('%s') does not exist ",
 			wt->parent_path);
-		err = -2;
-		goto out;
+		return GIT_ERROR;
 	}
 
 	if (!git_path_exists(wt->commondir_path)) {
 		giterr_set(GITERR_WORKTREE,
 			"Worktree common directory ('%s') does not exist ",
 			wt->commondir_path);
-		err = -3;
-		goto out;
+		return GIT_ERROR;
 	}
 
-out:
-	git_buf_free(&buf);
-
-	return err;
+	return 0;
 }
 
 int git_worktree_add_init_options(git_worktree_add_options *opts,
@@ -348,13 +340,30 @@ int git_worktree_add(git_worktree **out, git_repository *repo,
 	    || (err = write_wtfile(gitdir.ptr, "gitdir", &buf)) < 0)
 		goto out;
 
-	/* Create new branch */
-	if ((err = git_repository_head(&head, repo)) < 0)
-		goto out;
-	if ((err = git_commit_lookup(&commit, repo, &head->target.oid)) < 0)
-		goto out;
-	if ((err = git_branch_create(&ref, repo, name, commit, false)) < 0)
-		goto out;
+	/* Set up worktree reference */
+	if (wtopts.ref) {
+		if (!git_reference_is_branch(wtopts.ref)) {
+			giterr_set(GITERR_WORKTREE, "reference is not a branch");
+			err = -1;
+			goto out;
+		}
+
+		if (git_branch_is_checked_out(wtopts.ref)) {
+			giterr_set(GITERR_WORKTREE, "reference is already checked out");
+			err = -1;
+			goto out;
+		}
+
+		if ((err = git_reference_dup(&ref, wtopts.ref)) < 0)
+			goto out;
+	} else {
+		if ((err = git_repository_head(&head, repo)) < 0)
+			goto out;
+		if ((err = git_commit_lookup(&commit, repo, &head->target.oid)) < 0)
+			goto out;
+		if ((err = git_branch_create(&ref, repo, name, commit, false)) < 0)
+			goto out;
+	}
 
 	/* Set worktree's HEAD */
 	if ((err = git_repository_create_head(gitdir.ptr, git_reference_name(ref))) < 0)
@@ -372,9 +381,9 @@ int git_worktree_add(git_worktree **out, git_repository *repo,
 		goto out;
 
 out:
-	git_buf_free(&gitdir);
-	git_buf_free(&wddir);
-	git_buf_free(&buf);
+	git_buf_dispose(&gitdir);
+	git_buf_dispose(&wddir);
+	git_buf_dispose(&buf);
 	git_reference_free(ref);
 	git_reference_free(head);
 	git_commit_free(commit);
@@ -405,7 +414,7 @@ int git_worktree_lock(git_worktree *wt, const char *reason)
 	wt->locked = 1;
 
 out:
-	git_buf_free(&path);
+	git_buf_dispose(&path);
 
 	return err;
 }
@@ -423,13 +432,13 @@ int git_worktree_unlock(git_worktree *wt)
 		return -1;
 
 	if (p_unlink(path.ptr) != 0) {
-		git_buf_free(&path);
+		git_buf_dispose(&path);
 		return -1;
 	}
 
 	wt->locked = 0;
 
-	git_buf_free(&path);
+	git_buf_dispose(&path);
 
 	return 0;
 }
@@ -450,11 +459,23 @@ int git_worktree_is_locked(git_buf *reason, const git_worktree *wt)
 		git_futils_readbuffer(reason, path.ptr);
 
 out:
-	git_buf_free(&path);
+	git_buf_dispose(&path);
 
 	return ret;
 }
 
+const char *git_worktree_name(const git_worktree *wt)
+{
+	assert(wt);
+	return wt->name;
+}
+
+const char *git_worktree_path(const git_worktree *wt)
+{
+	assert(wt);
+	return wt->worktree_path;
+}
+
 int git_worktree_prune_init_options(
 	git_worktree_prune_options *opts,
 	unsigned int version)
@@ -483,7 +504,7 @@ int git_worktree_is_prunable(git_worktree *wt,
 		if (!reason.size)
 			git_buf_attach_notowned(&reason, "no reason given", 15);
 		giterr_set(GITERR_WORKTREE, "Not pruning locked working tree: '%s'", reason.ptr);
-		git_buf_free(&reason);
+		git_buf_dispose(&reason);
 
 		return 0;
 	}
@@ -551,7 +572,7 @@ int git_worktree_prune(git_worktree *wt,
 		goto out;
 
 out:
-	git_buf_free(&path);
+	git_buf_dispose(&path);
 
 	return err;
 }

data/vendor/libgit2/src/worktree.h

@@ -18,6 +18,8 @@ struct git_worktree {
 	 * directory. */
 	char *name;
 
+	/* Path to the where the worktree lives in the filesystem */
+	char *worktree_path;
 	/* Path to the .git file in the working tree's repository */
 	char *gitlink_path;
 	/* Path to the .git directory inside the parent's

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

@@ -33,8 +33,10 @@
 /** Declare a function as always inlined. */
 #if defined(_MSC_VER)
 # define XDL_INLINE(type) static __inline type
+#elif defined(__GNUC__)
+# define XDL_INLINE(type) static __inline__ type
 #else
-# define XDL_INLINE(type) static inline type
+#define XDG_INLINE(type) static type
 #endif
 
 typedef struct s_xdpsplit {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugged
 version: !ruby/object:Gem::Version
-  version: 0.27.5
+  version: 0.27.7
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -131,6 +131,7 @@ files:
 - 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/deps/http-parser/CMakeLists.txt
 - vendor/libgit2/deps/http-parser/LICENSE-MIT
@@ -194,6 +195,7 @@ files:
 - 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
 - vendor/libgit2/include/git2/net.h
@@ -224,6 +226,7 @@ files:
 - vendor/libgit2/include/git2/stdint.h
 - vendor/libgit2/include/git2/strarray.h
 - 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/config.h
 - vendor/libgit2/include/git2/sys/diff.h
@@ -234,6 +237,7 @@ files:
 - vendor/libgit2/include/git2/sys/merge.h
 - vendor/libgit2/include/git2/sys/odb_backend.h
 - vendor/libgit2/include/git2/sys/openssl.h
+- vendor/libgit2/include/git2/sys/path.h
 - vendor/libgit2/include/git2/sys/refdb_backend.h
 - vendor/libgit2/include/git2/sys/reflog.h
 - vendor/libgit2/include/git2/sys/refs.h
@@ -251,6 +255,8 @@ files:
 - 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/annotated_commit.c
 - vendor/libgit2/src/annotated_commit.h
 - vendor/libgit2/src/apply.c
@@ -339,6 +345,8 @@ files:
 - 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
@@ -360,6 +368,8 @@ files:
 - vendor/libgit2/src/iterator.c
 - vendor/libgit2/src/iterator.h
 - vendor/libgit2/src/khash.h
+- vendor/libgit2/src/mailmap.c
+- vendor/libgit2/src/mailmap.h
 - vendor/libgit2/src/map.h
 - vendor/libgit2/src/merge.c
 - vendor/libgit2/src/merge.h
@@ -447,9 +457,13 @@ 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/curl.c
 - vendor/libgit2/src/streams/curl.h
+- vendor/libgit2/src/streams/mbedtls.c
+- vendor/libgit2/src/streams/mbedtls.h
 - vendor/libgit2/src/streams/openssl.c
 - vendor/libgit2/src/streams/openssl.h
 - vendor/libgit2/src/streams/socket.c