Bump libgit2 to 0.22

xuanxu · Jan 14, 2015 · 4113f2a · 4113f2a
1 parent 8938e3a
commit 4113f2a
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 34 deletions.
diff --git a/deps/Makefile b/deps/Makefile
@@ -1783,12 +1783,7 @@ libgit2-$(LIBGIT2_VER).tar.gz:
 	$(JLDOWNLOAD) $@ https://github.com/libgit2/libgit2/archive/v$(LIBGIT2_VER).tar.gz
 libgit2-$(LIBGIT2_VER)/CMakeLists.txt: libgit2-$(LIBGIT2_VER).tar.gz
 	$(JLCHECKSUM) $<
-ifeq ($(BUILD_OS),WINNT)
-	$(TAR) --exclude=libgit2-$(LIBGIT2_VER)/tests/resources/template/hooks/link.sample -zxf $<
-else
 	$(TAR) zxf $<
-endif
-	cd libgit2-$(LIBGIT2_VER) && patch -p1 < ../libgit2-0.21.3-mingw.patch
 	touch -c $@
 libgit2-$(LIBGIT2_VER)/build/Makefile: libgit2-$(LIBGIT2_VER)/CMakeLists.txt
 	mkdir -p libgit2-$(LIBGIT2_VER)/build

diff --git a/deps/Versions.make b/deps/Versions.make
@@ -14,4 +14,4 @@ MPFR_VER=3.1.2
 PATCHELF_VER = 0.8
 GIT_VER = 1.8.5.6
 VIRTUALENV_VER = 1.11.6
-LIBGIT2_VER = 0.21.3
+LIBGIT2_VER = 0.22.0
diff --git a/deps/checksums/libgit2-0.21.3.tar.gz/md5 b/deps/checksums/libgit2-0.21.3.tar.gz/md5
diff --git a/deps/checksums/libgit2-0.21.3.tar.gz/sha512 b/deps/checksums/libgit2-0.21.3.tar.gz/sha512
diff --git a/deps/checksums/libgit2-0.22.0.tar.gz/md5 b/deps/checksums/libgit2-0.22.0.tar.gz/md5
@@ -0,0 +1 @@
+a8c689d4887cc085295dcf43c46f5f1f
diff --git a/deps/checksums/libgit2-0.22.0.tar.gz/sha512 b/deps/checksums/libgit2-0.22.0.tar.gz/sha512
@@ -0,0 +1 @@
+08d939f9fe6000587ce3695e215e92fba77de32c7b4e898d8ceeacd8e6f6151dd69bd160ef9e38a0e073a970712d61d34955320847d51e3c67910a413e909d42
diff --git a/deps/libgit2-0.21.3-mingw.patch b/deps/libgit2-0.21.3-mingw.patch
diff --git a/test/libgit2.jl b/test/libgit2.jl
@@ -7,7 +7,7 @@ function check_version()
     ccall((:git_libgit2_version, :libgit2), Void,
           (Ptr{Cint}, Ptr{Cint}, Ptr{Cint}), major, minor, patch)
     v = VersionNumber(major[1], minor[1], patch[1])
-    if v.major == LIBGIT2_VER.major && v.minor == LIBGIT2_VER.minor
+    if v.major == LIBGIT2_VER.major && v.minor >= LIBGIT2_VER.minor
         return true
     else
         return false
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		08d939f9fe6000587ce3695e215e92fba77de32c7b4e898d8ceeacd8e6f6151dd69bd160ef9e38a0e073a970712d61d34955320847d51e3c67910a413e909d42