summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Ezell <[email protected]>2014-02-28 10:46:57 -0800
committerJesse Ezell <[email protected]>2014-02-28 10:46:57 -0800
commit2c56324ca5e2513b386a7b1f94b3b62881183769 (patch)
treef866ad3eb9b6b272e345e2fd2d4249dfd34359c8
parenta5df6111003cb032911a793f186aefb8f27243ef (diff)
fix bad git_buf handling
-rw-r--r--branch.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/branch.go b/branch.go
index 68e1b93..9f8c22b 100644
--- a/branch.go
+++ b/branch.go
@@ -142,9 +142,9 @@ func (repo *Repository) RemoteName(canonicalBranchName string) (string, error) {
if ret < 0 {
return "", MakeGitError(ret)
}
- C.git_buf_free(&nameBuf)
+ defer C.git_buf_free(&nameBuf)
- return C.GoStringN(nameBuf.ptr, C.int(nameBuf.size)), nil
+ return C.GoString(nameBuf.ptr), nil
}
func (b *Branch) SetUpstream(upstreamName string) error {
@@ -185,7 +185,7 @@ func (repo *Repository) UpstreamName(canonicalBranchName string) (string, error)
if ret < 0 {
return "", MakeGitError(ret)
}
- C.git_buf_free(&nameBuf)
+ defer C.git_buf_free(&nameBuf)
- return C.GoStringN(nameBuf.ptr, C.int(nameBuf.size)), nil
+ return C.GoString(nameBuf.ptr), nil
}