diff options
| author | Jesse Ezell <[email protected]> | 2014-03-26 11:28:48 -0700 |
|---|---|---|
| committer | Jesse Ezell <[email protected]> | 2014-03-26 11:28:48 -0700 |
| commit | 50a3c4aa0935adb798bc4ecf6612710908d227cf (patch) | |
| tree | 78c723825cb9b039de6922574f3a2a6840495e3d /submodule.go | |
| parent | 85420f2002ae85b2e86b3c37c04e462c1cef462a (diff) | |
update to new merge API
Diffstat (limited to 'submodule.go')
| -rw-r--r-- | submodule.go | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/submodule.go b/submodule.go index a94afd4..e192e15 100644 --- a/submodule.go +++ b/submodule.go @@ -287,22 +287,32 @@ func (sub *Submodule) Open() (*Repository, error) { return repo, nil } -func (sub *Submodule) Reload() error { +func (sub *Submodule) Reload(force bool) error { runtime.LockOSThread() defer runtime.UnlockOSThread() - ret := C.git_submodule_reload(sub.ptr) + cforce := C.int(0) + if force { + cforce = C.int(1) + } + + ret := C.git_submodule_reload(sub.ptr, cforce) if ret < 0 { return MakeGitError(ret) } return nil } -func (repo *Repository) ReloadAllSubmodules() error { +func (repo *Repository) ReloadAllSubmodules(force bool) error { runtime.LockOSThread() defer runtime.UnlockOSThread() - ret := C.git_submodule_reload_all(repo.ptr) + cforce := C.int(0) + if force { + cforce = C.int(1) + } + + ret := C.git_submodule_reload_all(repo.ptr, cforce) if ret < 0 { return MakeGitError(ret) } |
