From 50a3c4aa0935adb798bc4ecf6612710908d227cf Mon Sep 17 00:00:00 2001 From: Jesse Ezell Date: Wed, 26 Mar 2014 11:28:48 -0700 Subject: update to new merge API --- submodule.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'submodule.go') 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) } -- cgit v1.2.3