Merge pull request #473 from libgit2/cmn/bump-v26

Update vendored libgit2 to v0.26.8

.travis.yml

@@ -11,6 +11,12 @@ matrix:
   allow_failures:
     - go: tip
 
+git:
+  submodules: false
+
+before_install:
+  - git submodule update --init
+
 branches:
   only:
   - master

commit.go

@@ -18,19 +18,15 @@ type Commit struct {
 	cast_ptr *C.git_commit
 }
 
-func (c *Commit) Message() string {
+func (c Commit) Message() string {
-	ret := C.GoString(C.git_commit_message(c.cast_ptr))
+	return C.GoString(C.git_commit_message(c.cast_ptr))
-	runtime.KeepAlive(c)
-	return ret
 }
 
-func (c *Commit) RawMessage() string {
+func (c Commit) RawMessage() string {
-	ret := C.GoString(C.git_commit_message_raw(c.cast_ptr))
+	return C.GoString(C.git_commit_message_raw(c.cast_ptr))
-	runtime.KeepAlive(c)
-	return ret
 }
 
-func (c *Commit) ExtractSignature() (string, string, error) {
+func (c Commit) ExtractSignature() (string, string, error) {
 
 	var c_signed C.git_buf
 	defer C.git_buf_free(&c_signed)
@@ -44,7 +40,7 @@ func (c *Commit) ExtractSignature() (string, string, error) {
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 	ret := C.git_commit_extract_signature(&c_signature, &c_signed, repo, oid.toC(), nil)
-	runtime.KeepAlive(oid)
+
 	if ret < 0 {
 		return "", "", MakeGitError(ret)
 	} else {
@@ -53,20 +49,17 @@ func (c *Commit) ExtractSignature() (string, string, error) {
 
 }
 
-func (c *Commit) Summary() string {
+func (c Commit) Summary() string {
-	ret := C.GoString(C.git_commit_summary(c.cast_ptr))
+	return C.GoString(C.git_commit_summary(c.cast_ptr))
-	runtime.KeepAlive(c)
-	return ret
 }
 
-func (c *Commit) Tree() (*Tree, error) {
+func (c Commit) Tree() (*Tree, error) {
 	var ptr *C.git_tree
 
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
 	err := C.git_commit_tree(&ptr, c.cast_ptr)
-	runtime.KeepAlive(c)
 	if err < 0 {
 		return nil, MakeGitError(err)
 	}
@@ -74,24 +67,18 @@ func (c *Commit) Tree() (*Tree, error) {
 	return allocTree(ptr, c.repo), nil
 }
 
-func (c *Commit) TreeId() *Oid {
+func (c Commit) TreeId() *Oid {
-	ret := newOidFromC(C.git_commit_tree_id(c.cast_ptr))
+	return newOidFromC(C.git_commit_tree_id(c.cast_ptr))
-	runtime.KeepAlive(c)
-	return ret
 }
 
-func (c *Commit) Author() *Signature {
+func (c Commit) Author() *Signature {
 	cast_ptr := C.git_commit_author(c.cast_ptr)
-	ret := newSignatureFromC(cast_ptr)
+	return newSignatureFromC(cast_ptr)
-	runtime.KeepAlive(c)
-	return ret
 }
 
-func (c *Commit) Committer() *Signature {
+func (c Commit) Committer() *Signature {
 	cast_ptr := C.git_commit_committer(c.cast_ptr)
-	ret := newSignatureFromC(cast_ptr)
+	return newSignatureFromC(cast_ptr)
-	runtime.KeepAlive(c)
-	return ret
 }
 
 func (c *Commit) Parent(n uint) *Commit {

git_dynamic.go

@@ -6,8 +6,8 @@ package git
 #include <git2.h>
 #cgo pkg-config: libgit2
 
-#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 25
+#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 26
-# error "Invalid libgit2 version; this git2go supports libgit2 v0.25"
+# error "Invalid libgit2 version; this git2go supports libgit2 v0.26"
 #endif
 
 */

git_static.go

@@ -9,8 +9,8 @@ package git
 #cgo !windows pkg-config: --static ${SRCDIR}/vendor/libgit2/build/libgit2.pc
 #include <git2.h>
 
-#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 25
+#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 26
-# error "Invalid libgit2 version; this git2go supports libgit2 v0.25"
+# error "Invalid libgit2 version; this git2go supports libgit2 v0.26"
 #endif
 
 */

submodule.go

@@ -15,7 +15,6 @@ import (
 type SubmoduleUpdateOptions struct {
 	*CheckoutOpts
 	*FetchOptions
-	CloneCheckoutStrategy CheckoutStrategy
 }
 
 // Submodule
@@ -369,7 +368,6 @@ func populateSubmoduleUpdateOptions(ptr *C.git_submodule_update_options, opts *S
 
 	populateCheckoutOpts(&ptr.checkout_opts, opts.CheckoutOpts)
 	populateFetchOptions(&ptr.fetch_opts, opts.FetchOptions)
-	ptr.clone_checkout_strategy = C.uint(opts.CloneCheckoutStrategy)
 
 	return nil
 }

vendor/libgit2

@@ -1 +1 @@
-Subproject commit df4dfaadcf709646ebab2e57e3589952cf1ac809
+Subproject commit 32dc763c116999240440b5054798208d97b4c562