jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Fix inconsistent function call in Submodule.

This commit is contained in:
David Calavera 2015-01-06 14:02:44 -08:00
parent d57246fb74
commit 8adbc08d70
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
submodule.go
View File

@ -11,6 +11,15 @@ import (
"unsafe" "unsafe"
) )
// SubmoduleUpdateOptions
type SubmoduleUpdateOptions struct {
*CheckoutOpts
*RemoteCallbacks
Version uint64
CloneCheckoutStrategy CheckoutStrategy
Signature *Signature
}
// Submodule // Submodule
type Submodule struct { type Submodule struct {
ptr *C.git_submodule ptr *C.git_submodule
@ -20,10 +29,10 @@ type SubmoduleUpdate int
const ( const (
SubmoduleUpdateReset SubmoduleUpdate = C.GIT_SUBMODULE_UPDATE_RESET SubmoduleUpdateReset SubmoduleUpdate = C.GIT_SUBMODULE_UPDATE_RESET
SubmoduleUpdateCheckout SubmoduleUpdate = C.GIT_SUBMODULE_UPDATE_CHECKOUT SubmoduleUpdateCheckout SubmoduleUpdate = C.GIT_SUBMODULE_UPDATE_CHECKOUT
SubmoduleUpdateRebase SubmoduleUpdate = C.GIT_SUBMODULE_UPDATE_REBASE SubmoduleUpdateRebase SubmoduleUpdate = C.GIT_SUBMODULE_UPDATE_REBASE
SubmoduleUpdateMerge SubmoduleUpdate = C.GIT_SUBMODULE_UPDATE_MERGE SubmoduleUpdateMerge SubmoduleUpdate = C.GIT_SUBMODULE_UPDATE_MERGE
SubmoduleUpdateNone SubmoduleUpdate = C.GIT_SUBMODULE_UPDATE_NONE SubmoduleUpdateNone SubmoduleUpdate = C.GIT_SUBMODULE_UPDATE_NONE
) )
type SubmoduleIgnore int type SubmoduleIgnore int
@ -226,8 +235,8 @@ func (sub *Submodule) SetIgnore(ignore SubmoduleIgnore) SubmoduleIgnore {
return SubmoduleIgnore(o) return SubmoduleIgnore(o)
} }
func (sub *Submodule) Update() SubmoduleUpdate { func (sub *Submodule) UpdateStrategy() SubmoduleUpdate {
o := C.git_submodule_update(sub.ptr) o := C.git_submodule_update_strategy(sub.ptr)
return SubmoduleUpdate(o) return SubmoduleUpdate(o)
} }

2
vendor/libgit2 vendored

@ -1 +1 @@
Subproject commit 55d9c29aa0c69cdd766c5100fc012d8e0b486e23 Subproject commit 007f3ff6fa68a95feee4e70f825a49ea0ec9cb2d