Merge branch 'master' into custom_odb

Conflicts:
	odb.go
	wrapper.c

1 files changed, 18 insertions, 18 deletions

diff --git a/submodule.go b/submodule.go
index 9abf333..f6ab5e1 100644
--- a/submodule.go
+++ b/submodule.go
@@ -81,7 +81,7 @@ func (repo *Repository) LookupSubmodule(name string) (*Submodule, error) {
 
 	ret := C.git_submodule_lookup(&sub.ptr, repo.ptr, cname)
 	if ret < 0 {
-		return nil, LastError()
+		return nil, MakeGitError(ret)
 	}
 
 	return sub, nil
@@ -102,7 +102,7 @@ func (repo *Repository) ForeachSubmodule(cbk SubmoduleCbk) error {
 
 	ret := C._go_git_visit_submodule(repo.ptr, unsafe.Pointer(&cbk))
 	if ret < 0 {
-		return LastError()
+		return MakeGitError(ret)
 	}
 	return nil
 }
@@ -120,7 +120,7 @@ func (repo *Repository) AddSubmodule(url, path string, use_git_link bool) (*Subm
 
 	ret := C.git_submodule_add_setup(&sub.ptr, repo.ptr, curl, cpath, cbool(use_git_link))
 	if ret < 0 {
-		return nil, LastError()
+		return nil, MakeGitError(ret)
 	}
 	return sub, nil
 }
@@ -131,7 +131,7 @@ func (sub *Submodule) FinalizeAdd() error {
 
 	ret := C.git_submodule_add_finalize(sub.ptr)
 	if ret < 0 {
-		return LastError()
+		return MakeGitError(ret)
 	}
 	return nil
 }
@@ -142,7 +142,7 @@ func (sub *Submodule) AddToIndex(write_index bool) error {
 
 	ret := C.git_submodule_add_to_index(sub.ptr, cbool(write_index))
 	if ret < 0 {
-		return LastError()
+		return MakeGitError(ret)
 	}
 	return nil
 }
@@ -153,7 +153,7 @@ func (sub *Submodule) Save() error {
 
 	ret := C.git_submodule_save(sub.ptr)
 	if ret < 0 {
-		return LastError()
+		return MakeGitError(ret)
 	}
 	return nil
 }
@@ -188,7 +188,7 @@ func (sub *Submodule) SetUrl(url string) error {
 
 	ret := C.git_submodule_set_url(sub.ptr, curl)
 	if ret < 0 {
-		return LastError()
+		return MakeGitError(ret)
 	}
 	return nil
 }
@@ -238,7 +238,7 @@ func (sub *Submodule) SetUpdate(update SubmoduleUpdate) SubmoduleUpdate {
 }
 
 func (sub *Submodule) FetchRecurseSubmodules() SubmoduleRecurse {
-	return SubmoduleRecurse(C.git_submodule_fetch_recurse_submodules(sub.ptr));
+	return SubmoduleRecurse(C.git_submodule_fetch_recurse_submodules(sub.ptr))
 }
 
 func (sub *Submodule) SetFetchRecurseSubmodules(recurse SubmoduleRecurse) error {
@@ -247,7 +247,7 @@ func (sub *Submodule) SetFetchRecurseSubmodules(recurse SubmoduleRecurse) error
 
 	ret := C.git_submodule_set_fetch_recurse_submodules(sub.ptr, C.git_submodule_recurse_t(recurse))
 	if ret < 0 {
-		return LastError()
+		return MakeGitError(C.int(ret))
 	}
 	return nil
 }
@@ -258,7 +258,7 @@ func (sub *Submodule) Init(overwrite bool) error {
 
 	ret := C.git_submodule_init(sub.ptr, cbool(overwrite))
 	if ret < 0 {
-		return LastError()
+		return MakeGitError(ret)
 	}
 	return nil
 }
@@ -269,7 +269,7 @@ func (sub *Submodule) Sync() error {
 
 	ret := C.git_submodule_sync(sub.ptr)
 	if ret < 0 {
-		return LastError()
+		return MakeGitError(ret)
 	}
 	return nil
 }
@@ -282,29 +282,29 @@ func (sub *Submodule) Open() (*Repository, error) {
 
 	ret := C.git_submodule_open(&repo.ptr, sub.ptr)
 	if ret < 0 {
-		return nil, LastError()
+		return nil, MakeGitError(ret)
 	}
 	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)
+	ret := C.git_submodule_reload(sub.ptr, cbool(force))
 	if ret < 0 {
-		return LastError()
+		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)
+	ret := C.git_submodule_reload_all(repo.ptr, cbool(force))
 	if ret < 0 {
-		return LastError()
+		return MakeGitError(ret)
 	}
 	return nil
 }