diff options
| author | David Calavera <[email protected]> | 2015-01-06 14:02:44 -0800 |
|---|---|---|
| committer | David Calavera <[email protected]> | 2015-01-06 14:02:44 -0800 |
| commit | 8adbc08d70642e2d281654a9122b6c5ecfe1d2a7 (patch) | |
| tree | 9498de8fd71c51e7051b5cb88f200f1dddd11308 /submodule.go | |
| parent | d57246fb74404ed8b18d0d26d2b02b326ffd2cbe (diff) | |
Fix inconsistent function call in Submodule.
Diffstat (limited to 'submodule.go')
| -rw-r--r-- | submodule.go | 21 |
1 files changed, 15 insertions, 6 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) } |
