From 8adbc08d70642e2d281654a9122b6c5ecfe1d2a7 Mon Sep 17 00:00:00 2001
From: David Calavera <david.calavera@gmail.com>
Date: Tue, 6 Jan 2015 14:02:44 -0800
Subject: [PATCH 1/4] Fix inconsistent function call in Submodule.

---
 submodule.go   | 21 +++++++++++++++------
 vendor/libgit2 |  2 +-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/submodule.go b/submodule.go
index d5ab69f..bb86a0a 100644
--- a/submodule.go
+++ b/submodule.go
@@ -11,6 +11,15 @@ import (
 	"unsafe"
 )
 
+// SubmoduleUpdateOptions
+type SubmoduleUpdateOptions struct {
+	*CheckoutOpts
+	*RemoteCallbacks
+	Version               uint64
+	CloneCheckoutStrategy CheckoutStrategy
+	Signature             *Signature
+}
+
 // Submodule
 type Submodule struct {
 	ptr *C.git_submodule
@@ -20,10 +29,10 @@ type SubmoduleUpdate int
 
 const (
 	SubmoduleUpdateReset    SubmoduleUpdate = C.GIT_SUBMODULE_UPDATE_RESET
-	SubmoduleUpdateCheckout SubmoduleUpdate  = C.GIT_SUBMODULE_UPDATE_CHECKOUT
-	SubmoduleUpdateRebase   SubmoduleUpdate  = C.GIT_SUBMODULE_UPDATE_REBASE
-	SubmoduleUpdateMerge    SubmoduleUpdate  = C.GIT_SUBMODULE_UPDATE_MERGE
-	SubmoduleUpdateNone     SubmoduleUpdate  = C.GIT_SUBMODULE_UPDATE_NONE
+	SubmoduleUpdateCheckout SubmoduleUpdate = C.GIT_SUBMODULE_UPDATE_CHECKOUT
+	SubmoduleUpdateRebase   SubmoduleUpdate = C.GIT_SUBMODULE_UPDATE_REBASE
+	SubmoduleUpdateMerge    SubmoduleUpdate = C.GIT_SUBMODULE_UPDATE_MERGE
+	SubmoduleUpdateNone     SubmoduleUpdate = C.GIT_SUBMODULE_UPDATE_NONE
 )
 
 type SubmoduleIgnore int
@@ -226,8 +235,8 @@ func (sub *Submodule) SetIgnore(ignore SubmoduleIgnore) SubmoduleIgnore {
 	return SubmoduleIgnore(o)
 }
 
-func (sub *Submodule) Update() SubmoduleUpdate {
-	o := C.git_submodule_update(sub.ptr)
+func (sub *Submodule) UpdateStrategy() SubmoduleUpdate {
+	o := C.git_submodule_update_strategy(sub.ptr)
 	return SubmoduleUpdate(o)
 }
 
diff --git a/vendor/libgit2 b/vendor/libgit2
index 55d9c29..007f3ff 160000
--- a/vendor/libgit2
+++ b/vendor/libgit2
@@ -1 +1 @@
-Subproject commit 55d9c29aa0c69cdd766c5100fc012d8e0b486e23
+Subproject commit 007f3ff6fa68a95feee4e70f825a49ea0ec9cb2d

From 9b914e07cc314daa42e61807b23350b2571f643f Mon Sep 17 00:00:00 2001
From: David Calavera <david.calavera@gmail.com>
Date: Thu, 8 Jan 2015 13:44:58 -0800
Subject: [PATCH 2/4] Add Submodule.Update method.

Update libgit2 to a version that includes https://github.com/libgit2/libgit2/pull/2804.
---
 submodule.go   | 30 ++++++++++++++++++++++++++++++
 vendor/libgit2 |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/submodule.go b/submodule.go
index bb86a0a..67e4fab 100644
--- a/submodule.go
+++ b/submodule.go
@@ -316,3 +316,33 @@ func (repo *Repository) ReloadAllSubmodules(force bool) error {
 	}
 	return nil
 }
+
+func (sub *Submodule) Update(init bool, opts *SubmoduleUpdateOptions) error {
+	var copts C.git_submodule_update_options
+	populateSubmoduleUpdateOptions(&copts, opts)
+
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	ret := C.git_submodule_update(sub.ptr, cbool(init), &copts)
+	if ret < 0 {
+		return MakeGitError(ret)
+	}
+
+	return nil
+}
+
+func populateSubmoduleUpdateOptions(ptr *C.git_submodule_update_options, opts *SubmoduleUpdateOptions) {
+	C.git_submodule_update_init_options(ptr, C.GIT_SUBMODULE_UPDATE_OPTIONS_VERSION)
+
+	if opts == nil {
+		return
+	}
+
+	populateCheckoutOpts(&ptr.checkout_opts, opts.CheckoutOpts)
+	populateRemoteCallbacks(&ptr.remote_callbacks, opts.RemoteCallbacks)
+	ptr.clone_checkout_strategy = C.uint(opts.CloneCheckoutStrategy)
+	if opts.Signature != nil {
+		ptr.signature = opts.Signature.toC()
+	}
+}
diff --git a/vendor/libgit2 b/vendor/libgit2
index 007f3ff..1646412 160000
--- a/vendor/libgit2
+++ b/vendor/libgit2
@@ -1 +1 @@
-Subproject commit 007f3ff6fa68a95feee4e70f825a49ea0ec9cb2d
+Subproject commit 1646412d8fc9e1532a194df2515e9a5fde4da988

From 22f4a4edaa0c45979081993b92873a45d443e171 Mon Sep 17 00:00:00 2001
From: David Calavera <david.calavera@gmail.com>
Date: Thu, 8 Jan 2015 14:21:29 -0800
Subject: [PATCH 3/4] Do not double check if the signature is nil.

---
 submodule.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/submodule.go b/submodule.go
index 67e4fab..20fcbe9 100644
--- a/submodule.go
+++ b/submodule.go
@@ -342,7 +342,5 @@ func populateSubmoduleUpdateOptions(ptr *C.git_submodule_update_options, opts *S
 	populateCheckoutOpts(&ptr.checkout_opts, opts.CheckoutOpts)
 	populateRemoteCallbacks(&ptr.remote_callbacks, opts.RemoteCallbacks)
 	ptr.clone_checkout_strategy = C.uint(opts.CloneCheckoutStrategy)
-	if opts.Signature != nil {
-		ptr.signature = opts.Signature.toC()
-	}
+	ptr.signature = opts.Signature.toC()
 }

From ea7f567756fbe5060ad830dc5fcf3cea2038c425 Mon Sep 17 00:00:00 2001
From: David Calavera <david.calavera@gmail.com>
Date: Thu, 8 Jan 2015 15:06:35 -0800
Subject: [PATCH 4/4] Remove version from opts structure.

It's not necessary.
---
 submodule.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/submodule.go b/submodule.go
index 20fcbe9..f3e9e83 100644
--- a/submodule.go
+++ b/submodule.go
@@ -15,7 +15,6 @@ import (
 type SubmoduleUpdateOptions struct {
 	*CheckoutOpts
 	*RemoteCallbacks
-	Version               uint64
 	CloneCheckoutStrategy CheckoutStrategy
 	Signature             *Signature
 }