Merge branch 'v22'

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "vendor/libgit2"]
-	path = vendor/libgit2
-	url = https://github.com/libgit2/libgit2

.travis.yml

@@ -1,5 +1,14 @@
 language: go
 
+install:
+  - cd "${HOME}"
+  - wget -O libgit2-0.22.1.tar.gz https://github.com/libgit2/libgit2/archive/v0.22.1.tar.gz
+  - tar -xzvf libgit2-0.22.1.tar.gz
+  - cd libgit2-0.22.1 && mkdir build && cd build
+  - cmake -DTHREADSAFE=ON -DBUILD_CLAR=OFF -DCMAKE_C_FLAGS=-fPIC -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DCMAKE_INSTALL_PREFIX=/usr/local .. && make && sudo make install
+  - sudo ldconfig
+  - cd "${TRAVIS_BUILD_DIR}"
+
 go:
   - 1.1
   - 1.2

Makefile

@@ -1,11 +1,8 @@
 default: test
 
-build-libgit2:
+test:
-	./script/build-libgit2-static.sh
-
-test: build-libgit2
 	go run script/check-MakeGitError-thread-lock.go
-	./script/with-static.sh go test ./...
+	go test ./...
 
-install: build-libgit2
+install:
-	./script/with-static.sh go install ./...
+	go install ./...

git.go

@@ -3,6 +3,7 @@ package git
 /*
 #include <git2.h>
 #include <git2/sys/openssl.h>
+#cgo pkg-config: libgit2
 */
 import "C"
 import (

script/build-libgit2-static.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-VENDORED_PATH=vendor/libgit2
-
-cd $VENDORED_PATH &&
-mkdir -p install/lib &&
-mkdir -p build &&
-cd build &&
-cmake -DTHREADSAFE=ON \
-      -DBUILD_CLAR=OFF \
-      -DBUILD_SHARED_LIBS=OFF \
-      -DCMAKE_C_FLAGS=-fPIC \
-      -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-      -DCMAKE_INSTALL_PREFIX=../install \
-      .. &&
-
-cmake --build .

script/with-static.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-export BUILD="$PWD/vendor/libgit2/build"
-export PCFILE="$BUILD/libgit2.pc"
-
-FLAGS=$(pkg-config --static --libs $PCFILE) || exit 1
-export CGO_LDFLAGS="$BUILD/libgit2.a -L$BUILD ${FLAGS}"
-export CGO_CFLAGS="-I$PWD/vendor/libgit2/include"
-
-$@

vendor/libgit2

@@ -1 +0,0 @@
-Subproject commit 04bdd97f2b63793a8720fd19007911e946ba3c55