rugged 0.27.7 → 0.27.9

data/vendor/libgit2/src/worktree.h

@@ -18,8 +18,6 @@ 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,10 +33,8 @@
 /** 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 XDG_INLINE(type) static type
+# define XDL_INLINE(type) static inline 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.7
+  version: 0.27.9
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -123,6 +123,8 @@ files:
 - vendor/libgit2/CMakeLists.txt
 - vendor/libgit2/COPYING
 - vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake
+- vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.c.in
+- vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.cmake
 - vendor/libgit2/cmake/Modules/EnableWarnings.cmake
 - vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake
 - vendor/libgit2/cmake/Modules/FindGSSAPI.cmake
@@ -131,7 +133,6 @@ 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
@@ -195,7 +196,6 @@ 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
@@ -226,7 +226,6 @@ 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
@@ -237,7 +236,6 @@ 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
@@ -255,8 +253,6 @@ 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
@@ -345,8 +341,6 @@ 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
@@ -368,8 +362,6 @@ 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
@@ -457,13 +449,9 @@ 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
@@ -593,7 +581,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Rugged is a Ruby binding to the libgit2 linkable library

data/vendor/libgit2/cmake/Modules/FindmbedTLS.cmake

@@ -1,93 +0,0 @@
-# - Try to find mbedTLS
-# Once done this will define
-#
-# Read-Only variables
-#  MBEDTLS_FOUND - system has mbedTLS
-#  MBEDTLS_INCLUDE_DIR - the mbedTLS include directory
-#  MBEDTLS_LIBRARY_DIR - the mbedTLS library directory
-#  MBEDTLS_LIBRARIES - Link these to use mbedTLS
-#  MBEDTLS_LIBRARY - path to mbedTLS library
-#  MBEDX509_LIBRARY - path to mbedTLS X.509 library
-#  MBEDCRYPTO_LIBRARY - path to mbedTLS Crypto library
-#
-# Hint
-#  MBEDTLS_ROOT_DIR can be pointed to a local mbedTLS installation.
-
-SET(_MBEDTLS_ROOT_HINTS
-    ${MBEDTLS_ROOT_DIR}
-    ENV MBEDTLS_ROOT_DIR
-)
-
-SET(_MBEDTLS_ROOT_HINTS_AND_PATHS
-    HINTS ${_MBEDTLS_ROOT_HINTS}
-    PATHS ${_MBEDTLS_ROOT_PATHS}
-)
-
-FIND_PATH(MBEDTLS_INCLUDE_DIR
-    NAMES mbedtls/version.h
-    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
-    PATH_SUFFIXES include
-)
-
-IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARIES)
-    # Already in cache, be silent
-    SET(MBEDTLS_FIND_QUIETLY TRUE)
-ENDIF()
-
-FIND_LIBRARY(MBEDTLS_LIBRARY
-    NAMES mbedtls libmbedtls
-    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
-    PATH_SUFFIXES library
-)
-FIND_LIBRARY(MBEDX509_LIBRARY
-    NAMES mbedx509 libmbedx509
-    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
-    PATH_SUFFIXES library
-)
-FIND_LIBRARY(MBEDCRYPTO_LIBRARY
-    NAMES mbedcrypto libmbedcrypto
-    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
-    PATH_SUFFIXES library
-)
-
-IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY AND MBEDX509_LIBRARY AND MBEDCRYPTO_LIBRARY)
-     SET(MBEDTLS_FOUND TRUE)
-ENDIF()
-
-IF(MBEDTLS_FOUND)
-    # split mbedTLS into -L and -l linker options, so we can set them for pkg-config
-    GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_DIR ${MBEDTLS_LIBRARY} PATH)
-    GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY} NAME_WE)
-    GET_FILENAME_COMPONENT(MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY} NAME_WE)
-    GET_FILENAME_COMPONENT(MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY} NAME_WE)
-    STRING(REGEX REPLACE "^lib" "" MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY_FILE})
-    STRING(REGEX REPLACE "^lib" "" MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY_FILE})
-    STRING(REGEX REPLACE "^lib" "" MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY_FILE})
-    SET(MBEDTLS_LIBRARIES "-L${MBEDTLS_LIBRARY_DIR} -l${MBEDTLS_LIBRARY_FILE} -l${MBEDX509_LIBRARY_FILE} -l${MBEDCRYPTO_LIBRARY_FILE}")
-
-    IF(NOT MBEDTLS_FIND_QUIETLY)
-        MESSAGE(STATUS "Found mbedTLS:")
-        FILE(READ ${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h MBEDTLSCONTENT)
-        STRING(REGEX MATCH "MBEDTLS_VERSION_STRING +\"[0-9|.]+\"" MBEDTLSMATCH ${MBEDTLSCONTENT})
-        IF (MBEDTLSMATCH)
-            STRING(REGEX REPLACE "MBEDTLS_VERSION_STRING +\"([0-9|.]+)\"" "\\1" MBEDTLS_VERSION ${MBEDTLSMATCH})
-            MESSAGE(STATUS "  version ${MBEDTLS_VERSION}")
-        ENDIF(MBEDTLSMATCH)
-        MESSAGE(STATUS "  TLS: ${MBEDTLS_LIBRARY}")
-        MESSAGE(STATUS "  X509: ${MBEDX509_LIBRARY}")
-        MESSAGE(STATUS "  Crypto: ${MBEDCRYPTO_LIBRARY}")
-    ENDIF(NOT MBEDTLS_FIND_QUIETLY)
-ELSE(MBEDTLS_FOUND)
-    IF(MBEDTLS_FIND_REQUIRED)
-        MESSAGE(FATAL_ERROR "Could not find mbedTLS")
-    ENDIF(MBEDTLS_FIND_REQUIRED)
-ENDIF(MBEDTLS_FOUND)
-
-MARK_AS_ADVANCED(
-    MBEDTLS_INCLUDE_DIR
-    MBEDTLS_LIBRARY_DIR
-    MBEDTLS_LIBRARIES
-    MBEDTLS_LIBRARY
-    MBEDX509_LIBRARY
-    MBEDCRYPTO_LIBRARY
-)

data/vendor/libgit2/include/git2/mailmap.h

@@ -1,115 +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.
- */
-#ifndef INCLUDE_git_mailmap_h__
-#define INCLUDE_git_mailmap_h__
-
-#include "common.h"
-#include "types.h"
-#include "buffer.h"
-
-/**
- * @file git2/mailmap.h
- * @brief Mailmap parsing routines
- * @defgroup git_mailmap Git mailmap routines
- * @ingroup Git
- * @{
- */
-GIT_BEGIN_DECL
-
-/**
- * Allocate a new mailmap object.
- *
- * This object is empty, so you'll have to add a mailmap file before you can do
- * anything with it. The mailmap must be freed with 'git_mailmap_free'.
- *
- * @param out pointer to store the new mailmap
- * @return 0 on success, or an error code
- */
-GIT_EXTERN(int) git_mailmap_new(git_mailmap **out);
-
-/**
- * Free the mailmap and its associated memory.
- *
- * @param mm the mailmap to free
- */
-GIT_EXTERN(void) git_mailmap_free(git_mailmap *mm);
-
-/**
- * Add a single entry to the given mailmap object. If the entry already exists,
- * it will be replaced with the new entry.
- *
- * @param mm mailmap to add the entry to
- * @param real_name the real name to use, or NULL
- * @param real_email the real email to use, or NULL
- * @param replace_name the name to replace, or NULL
- * @param replace_email the email to replace
- * @return 0 on success, or an error code
- */
-GIT_EXTERN(int) git_mailmap_add_entry(
-	git_mailmap *mm, const char *real_name, const char *real_email,
-	const char *replace_name, const char *replace_email);
-
-/**
- * Create a new mailmap instance containing a single mailmap file
- *
- * @param out pointer to store the new mailmap
- * @param buf buffer to parse the mailmap from
- * @param len the length of the input buffer
- * @return 0 on success, or an error code
- */
-GIT_EXTERN(int) git_mailmap_from_buffer(
-	git_mailmap **out, const char *buf, size_t len);
-
-/**
- * Create a new mailmap instance from a repository, loading mailmap files based
- * on the repository's configuration.
- *
- * Mailmaps are loaded in the following order:
- *  1. '.mailmap' in the root of the repository's working directory, if present.
- *  2. The blob object identified by the 'mailmap.blob' config entry, if set.
- * 	   [NOTE: 'mailmap.blob' defaults to 'HEAD:.mailmap' in bare repositories]
- *  3. The path in the 'mailmap.file' config entry, if set.
- *
- * @param out pointer to store the new mailmap
- * @param repo repository to load mailmap information from
- * @return 0 on success, or an error code
- */
-GIT_EXTERN(int) git_mailmap_from_repository(
-	git_mailmap **out, git_repository *repo);
-
-/**
- * Resolve a name and email to the corresponding real name and email.
- *
- * The lifetime of the strings are tied to `mm`, `name`, and `email` parameters.
- *
- * @param real_name pointer to store the real name
- * @param real_email pointer to store the real email
- * @param mm the mailmap to perform a lookup with (may be NULL)
- * @param name the name to look up
- * @param email the email to look up
- * @return 0 on success, or an error code
- */
-GIT_EXTERN(int) git_mailmap_resolve(
-	const char **real_name, const char **real_email,
-	const git_mailmap *mm, const char *name, const char *email);
-
-/**
- * Resolve a signature to use real names and emails with a mailmap.
- *
- * Call `git_signature_free()` to free the data.
- *
- * @param out new signature
- * @param mm mailmap to resolve with
- * @param sig signature to resolve
- * @return 0 or an error code
- */
-GIT_EXTERN(int) git_mailmap_resolve_signature(
-	git_signature **out, const git_mailmap *mm, const git_signature *sig);
-
-/** @} */
-GIT_END_DECL
-#endif

data/vendor/libgit2/include/git2/sys/alloc.h

@@ -1,101 +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.
- */
-
-#ifndef INCLUDE_sys_git_alloc_h__
-#define INCLUDE_sys_git_alloc_h__
-
-#include "git2/common.h"
-
-GIT_BEGIN_DECL
-
-/**
- * An instance for a custom memory allocator
- *
- * Setting the pointers of this structure allows the developer to implement
- * custom memory allocators. The global memory allocator can be set by using
- * "GIT_OPT_SET_ALLOCATOR" with the `git_libgit2_opts` function. Keep in mind
- * that all fields need to be set to a proper function.
- */
-typedef struct {
-	/* Allocate `n` bytes of memory */
-	void *(*gmalloc)(size_t n, const char *file, int line);
-
-	/*
-	 * Allocate memory for an array of `nelem` elements, where each element
-	 * has a size of `elsize`. Returned memory shall be initialized to
-	 * all-zeroes
-	 */
-	void *(*gcalloc)(size_t nelem, size_t elsize, const char *file, int line);
-
-	/* Allocate memory for the string `str` and duplicate its contents. */
-	char *(*gstrdup)(const char *str, const char *file, int line);
-
-	/*
-	 * Equivalent to the `gstrdup` function, but only duplicating at most
-	 * `n + 1` bytes
-	 */
-	char *(*gstrndup)(const char *str, size_t n, const char *file, int line);
-
-	/*
-	 * Equivalent to `gstrndup`, but will always duplicate exactly `n` bytes
-	 * of `str`. Thus, out of bounds reads at `str` may happen.
-	 */
-	char *(*gsubstrdup)(const char *str, size_t n, const char *file, int line);
-
-	/*
-	 * This function shall deallocate the old object `ptr` and return a
-	 * pointer to a new object that has the size specified by `size`. In
-	 * case `ptr` is `NULL`, a new array shall be allocated.
-	 */
-	void *(*grealloc)(void *ptr, size_t size, const char *file, int line);
-
-	/*
-	 * This function shall be equivalent to `grealloc`, but allocating
-	 * `neleme * elsize` bytes.
-	 */
-	void *(*greallocarray)(void *ptr, size_t nelem, size_t elsize, const char *file, int line);
-
-	/*
-	 * This function shall allocate a new array of `nelem` elements, where
-	 * each element has a size of `elsize` bytes.
-	 */
-	void *(*gmallocarray)(size_t nelem, size_t elsize, const char *file, int line);
-
-	/*
-	 * This function shall free the memory pointed to by `ptr`. In case
-	 * `ptr` is `NULL`, this shall be a no-op.
-	 */
-	void (*gfree)(void *ptr);
-} git_allocator;
-
-/**
- * Initialize the allocator structure to use the `stdalloc` pointer.
- *
- * Set up the structure so that all of its members are using the standard
- * "stdalloc" allocator functions. The structure can then be used with
- * `git_allocator_setup`.
- *
- * @param allocator The allocator that is to be initialized.
- * @return An error code or 0.
- */
-int git_stdalloc_init_allocator(git_allocator *allocator);
-
-/**
- * Initialize the allocator structure to use the `crtdbg` pointer.
- *
- * Set up the structure so that all of its members are using the "crtdbg"
- * allocator functions. Note that this allocator is only available on Windows
- * platforms and only if libgit2 is being compiled with "-DMSVC_CRTDBG".
- *
- * @param allocator The allocator that is to be initialized.
- * @return An error code or 0.
- */
-int git_win32_crtdbg_init_allocator(git_allocator *allocator);
-
-GIT_END_DECL
-
-#endif

data/vendor/libgit2/include/git2/sys/path.h

@@ -1,55 +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.
- */
-
-#ifndef INCLUDE_sys_git_path_h__
-#define INCLUDE_sys_git_path_h__
-
-#include "git2/common.h"
-
-GIT_BEGIN_DECL
-
-/*
- * The order needs to stay the same to not break the `gitfiles`
- * array in path.c
- */
-typedef enum {
-	GIT_PATH_GITFILE_GITIGNORE,
-	GIT_PATH_GITFILE_GITMODULES,
-	GIT_PATH_GITFILE_GITATTRIBUTES
-} git_path_gitfile;
-
-typedef enum {
-	/* Do both NTFS- and HFS-specific checks */
-	GIT_PATH_FS_GENERIC,
-	/* Do NTFS-specific checks only */
-	GIT_PATH_FS_NTFS,
-	/* Do HFS-specific checks only */
-	GIT_PATH_FS_HFS
-} git_path_fs;
-
-/**
- * Check whether a path component corresponds to a .git$SUFFIX
- * file.
- *
- * As some filesystems do special things to filenames when
- * writing files to disk, you cannot always do a plain string
- * comparison to verify whether a file name matches an expected
- * path or not. This function can do the comparison for you,
- * depending on the filesystem you're on.
- *
- * @param path the path component to check
- * @param pathlen the length of `path` that is to be checked
- * @param gitfile which file to check against
- * @param fs which filesystem-specific checks to use
- * @return 0 in case the file does not match, a positive value if
- *         it does; -1 in case of an error
- */
-extern int git_path_is_gitfile(const char *path, size_t pathlen, git_path_gitfile gitfile, git_path_fs fs);
-
-GIT_END_DECL
-
-#endif	/* INCLUDE_sys_git_path */