summaryrefslogtreecommitdiff
path: root/repository.go
diff options
context:
space:
mode:
authorCarlos Martín Nieto <[email protected]>2014-04-26 20:42:18 +0200
committerCarlos Martín Nieto <[email protected]>2014-04-26 20:42:18 +0200
commit4df7eb516c7c73f82a62a8bdb2ac33f2b73ab981 (patch)
tree3291dab43f1937316037a27380e8fe610f6ada90 /repository.go
parent57f14a25914b431a9034b252314edf74cf7eecbf (diff)
parent9d8cbe7547d499fefb69bf42e975a2f7e8e7fca4 (diff)
Merge pull request #63 from jezell/jezell/merge
Merge functions (in progress)
Diffstat (limited to 'repository.go')
-rw-r--r--repository.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/repository.go b/repository.go
index ffd1bcc..15a3544 100644
--- a/repository.go
+++ b/repository.go
@@ -387,7 +387,8 @@ func (v *Repository) EnsureLog(name string) error {
runtime.LockOSThread()
defer runtime.UnlockOSThread()
- if ret := C.git_reference_ensure_log(v.ptr, cname); ret < 0 {
+ ret := C.git_reference_ensure_log(v.ptr, cname)
+ if ret < 0 {
return MakeGitError(ret)
}
@@ -420,7 +421,8 @@ func (v *Repository) DwimReference(name string) (*Reference, error) {
defer runtime.UnlockOSThread()
var ptr *C.git_reference
- if ret := C.git_reference_dwim(&ptr, v.ptr, cname); ret < 0 {
+ ret := C.git_reference_dwim(&ptr, v.ptr, cname)
+ if ret < 0 {
return nil, MakeGitError(ret)
}