rugged 0.25.0b2 → 0.25.0b3

data/vendor/libgit2/src/tree.h

@@ -17,15 +17,14 @@
 struct git_tree_entry {
 	uint16_t attr;
 	uint16_t filename_len;
-	git_oid oid;
-	bool pooled;
-	char filename[GIT_FLEX_ARRAY];
+	const git_oid *oid;
+	const char *filename;
 };
 
 struct git_tree {
 	git_object object;
-	git_vector entries;
-	git_pool pool;
+	git_odb_object *odb_obj;
+	git_array_t(git_tree_entry) entries;
 };
 
 struct git_treebuilder {

data/vendor/libgit2/src/unix/map.c

@@ -24,6 +24,11 @@ int git__page_size(size_t *page_size)
 	return 0;
 }
 
+int git__mmap_alignment(size_t *alignment)
+{
+  return git__page_size(alignment);
+}
+
 int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset)
 {
 	int mprot = PROT_READ;

data/vendor/libgit2/src/win32/map.c

@@ -17,22 +17,41 @@ static DWORD get_page_size(void)
 
 	if (!page_size) {
 		GetSystemInfo(&sys);
-		page_size = sys.dwAllocationGranularity;
+		page_size = sys.dwPageSize;
 	}
 
 	return page_size;
 }
 
+static DWORD get_allocation_granularity(void)
+{
+	static DWORD granularity;
+	SYSTEM_INFO sys;
+
+	if (!granularity) {
+		GetSystemInfo(&sys);
+		granularity = sys.dwAllocationGranularity;
+	}
+
+	return granularity;
+}
+
 int git__page_size(size_t *page_size)
 {
 	*page_size = get_page_size();
 	return 0;
 }
 
+int git__mmap_alignment(size_t *page_size)
+{
+	*page_size = get_allocation_granularity();
+	return 0;
+}
+
 int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset)
 {
 	HANDLE fh = (HANDLE)_get_osfhandle(fd);
-	DWORD page_size = get_page_size();
+	DWORD alignment = get_allocation_granularity();
 	DWORD fmap_prot = 0;
 	DWORD view_prot = 0;
 	DWORD off_low = 0;
@@ -62,12 +81,12 @@ int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offs
 	if (prot & GIT_PROT_READ)
 		view_prot |= FILE_MAP_READ;
 
-	page_start = (offset / page_size) * page_size;
+	page_start = (offset / alignment) * alignment;
 	page_offset = offset - page_start;
 
-	if (page_offset != 0) { /* offset must be multiple of page size */
+	if (page_offset != 0) { /* offset must be multiple of the allocation granularity */
 		errno = EINVAL;
-		giterr_set(GITERR_OS, "Failed to mmap. Offset must be multiple of page size");
+		giterr_set(GITERR_OS, "Failed to mmap. Offset must be multiple of allocation granularity");
 		return -1;
 	}
 

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

@@ -301,10 +301,11 @@ int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 
 		xdl_free_ctx(&xe->xdf2);
 		xdl_free_ctx(&xe->xdf1);
+		xdl_free_classifier(&cf);
 		return -1;
 	}
 
-	if (!(xpp->flags & XDF_HISTOGRAM_DIFF))
+	if (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF)
 		xdl_free_classifier(&cf);
 
 	return 0;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugged
 version: !ruby/object:Gem::Version
-  version: 0.25.0b2
+  version: 0.25.0b3
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -122,7 +122,6 @@ files:
 - vendor/libgit2/AUTHORS
 - vendor/libgit2/CMakeLists.txt
 - vendor/libgit2/COPYING
-- vendor/libgit2/Makefile.embed
 - vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake
 - vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake
 - vendor/libgit2/cmake/Modules/FindGSSAPI.cmake
@@ -198,6 +197,7 @@ files:
 - vendor/libgit2/include/git2/pack.h
 - vendor/libgit2/include/git2/patch.h
 - vendor/libgit2/include/git2/pathspec.h
+- vendor/libgit2/include/git2/proxy.h
 - vendor/libgit2/include/git2/rebase.h
 - vendor/libgit2/include/git2/refdb.h
 - vendor/libgit2/include/git2/reflog.h
@@ -222,11 +222,13 @@ files:
 - vendor/libgit2/include/git2/sys/hashsig.h
 - 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/odb_backend.h
 - vendor/libgit2/include/git2/sys/openssl.h
 - vendor/libgit2/include/git2/sys/refdb_backend.h
 - vendor/libgit2/include/git2/sys/reflog.h
 - vendor/libgit2/include/git2/sys/refs.h
+- vendor/libgit2/include/git2/sys/remote.h
 - vendor/libgit2/include/git2/sys/repository.h
 - vendor/libgit2/include/git2/sys/stream.h
 - vendor/libgit2/include/git2/sys/transport.h
@@ -339,6 +341,8 @@ files:
 - vendor/libgit2/src/map.h
 - vendor/libgit2/src/merge.c
 - vendor/libgit2/src/merge.h
+- vendor/libgit2/src/merge_driver.c
+- vendor/libgit2/src/merge_driver.h
 - vendor/libgit2/src/merge_file.c
 - vendor/libgit2/src/message.c
 - vendor/libgit2/src/message.h
@@ -378,6 +382,8 @@ files:
 - vendor/libgit2/src/posix.h
 - vendor/libgit2/src/pqueue.c
 - vendor/libgit2/src/pqueue.h
+- vendor/libgit2/src/proxy.c
+- vendor/libgit2/src/proxy.h
 - vendor/libgit2/src/push.c
 - vendor/libgit2/src/push.h
 - vendor/libgit2/src/rebase.c
@@ -532,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rugged is a Ruby binding to the libgit2 linkable library

data/vendor/libgit2/Makefile.embed

@@ -1,60 +0,0 @@
-PLATFORM=$(shell uname -s)
-
-ifneq (,$(CROSS_COMPILE))
-	PREFIX=$(CROSS_COMPILE)-
-else
-	PREFIX=
-endif
-
-MINGW=0
-ifneq (,$(findstring MINGW32,$(PLATFORM)))
-	MINGW=1
-endif
-ifneq (,$(findstring mingw,$(CROSS_COMPILE)))
-	MINGW=1
-endif
-
-rm=rm -f
-AR=$(PREFIX)ar cq
-RANLIB=$(PREFIX)ranlib
-
-LIBNAME=libgit2.a
-
-ifeq ($(MINGW),1)
-	CC=gcc
-else
-	CC=cc
-endif
-
-CC:=$(PREFIX)$(CC)
-
-INCLUDES= -I. -Isrc -Iinclude -Ideps/http-parser -Ideps/zlib
-
-DEFINES= $(INCLUDES) -DNO_VIZ -DSTDC -DNO_GZIP -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $(EXTRA_DEFINES)
-CFLAGS= -g $(DEFINES) -Wall -Wextra -Wno-missing-field-initializers -O2 $(EXTRA_CFLAGS)
-
-SRCS = $(wildcard src/*.c) $(wildcard src/transports/*.c) $(wildcard src/xdiff/*.c) $(wildcard deps/http-parser/*.c) $(wildcard deps/zlib/*.c) src/hash/hash_generic.c
-
-ifeq ($(MINGW),1)
-	SRCS += $(wildcard src/win32/*.c) $(wildcard src/compat/*.c) deps/regex/regex.c
-	INCLUDES += -Ideps/regex
-	DEFINES += -DWIN32 -D_WIN32_WINNT=0x0501 -D__USE_MINGW_ANSI_STDIO=1
-else
-	SRCS += $(wildcard src/unix/*.c) 
-	CFLAGS += -fPIC
-endif
-
-OBJS = $(patsubst %.c,%.o,$(SRCS))
-
-%.c.o:
-	$(CC) $(CFLAGS) -c $*.c
-
-all: $(LIBNAME)
-
-$(LIBNAME): $(OBJS)
-	$(rm) $@
-	$(AR) $@ $(OBJS)
-	$(RANLIB) $@
-
-clean:
-	$(rm) $(OBJS) $(LIBNAME)