jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Keep a pointer to the repository in the objects and references 

Otherwise, the garbage collector might decide it's a good idea to throw
away the repository instance while the C object still has a pointer to
it. Hilarity ensues.
This commit is contained in:
Carlos Martín Nieto 2014-05-26 09:28:07 +02:00
parent f953d4e5c7
commit 8a73c75f1a
5 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
branch.go
View File

@ -57,7 +57,7 @@ func (i *BranchIterator) Next() (*Branch, BranchType, error) {
return nil, BranchLocal, MakeGitError(ecode)
}
branch := newReferenceFromC(refPtr).Branch()
branch := newReferenceFromC(refPtr, i.repo).Branch()
return branch, BranchType(refType), nil
}
@ -144,7 +144,7 @@ func (b *Branch) Move(newBranchName string, force bool, signature *Signature, ms
if ret < 0 {
return nil, MakeGitError(ret)
}
return newReferenceFromC(ptr).Branch(), nil
return newReferenceFromC(ptr, b.repo).Branch(), nil
}
func (b *Branch) IsHead() (bool, error) {
@ -175,7 +175,7 @@ func (repo *Repository) LookupBranch(branchName string, bt BranchType) (*Branch,
if ret < 0 {
return nil, MakeGitError(ret)
}
return newReferenceFromC(ptr).Branch(), nil
return newReferenceFromC(ptr, repo).Branch(), nil
}
func (b *Branch) Name() (string, error) {
@ -233,7 +233,7 @@ func (b *Branch) Upstream() (*Reference, error) {
if ret < 0 {
return nil, MakeGitError(ret)
}
return newReferenceFromC(ptr), nil
return newReferenceFromC(ptr, b.repo), nil
}
func (repo *Repository) UpstreamName(canonicalBranchName string) (string, error) {

4
commit.go
View File

@ -35,7 +35,7 @@ func (c Commit) Tree() (*Tree, error) {
return nil, MakeGitError(err)
}
return allocObject((*C.git_object)(ptr)).(*Tree), nil
return allocObject((*C.git_object)(ptr), c.repo).(*Tree), nil
}
func (c Commit) TreeId() *Oid {
@ -59,7 +59,7 @@ func (c *Commit) Parent(n uint) *Commit {
return nil
}
return allocObject((*C.git_object)(cobj)).(*Commit)
return allocObject((*C.git_object)(cobj), c.repo).(*Commit)
}
func (c *Commit) ParentId(n uint) *Oid {

13
object.go
View File

@ -27,6 +27,7 @@ type Object interface {
type gitObject struct {
ptr *C.git_object
repo *Repository
}
func (t ObjectType) String() (string) {
@ -69,12 +70,16 @@ func (o *gitObject) Free() {
C.git_object_free(o.ptr)
}
func allocObject(cobj *C.git_object) Object {
func allocObject(cobj *C.git_object, repo *Repository) Object {
obj := gitObject{
ptr: cobj,
repo: repo,
}
switch ObjectType(C.git_object_type(cobj)) {
case ObjectCommit:
commit := &Commit{
gitObject: gitObject{cobj},
gitObject: obj,
cast_ptr: (*C.git_commit)(cobj),
}
runtime.SetFinalizer(commit, (*Commit).Free)
@ -82,7 +87,7 @@ func allocObject(cobj *C.git_object) Object {
case ObjectTree:
tree := &Tree{
gitObject: gitObject{cobj},
gitObject: obj,
cast_ptr: (*C.git_tree)(cobj),
}
runtime.SetFinalizer(tree, (*Tree).Free)
@ -90,7 +95,7 @@ func allocObject(cobj *C.git_object) Object {
case ObjectBlob:
blob := &Blob{
gitObject: gitObject{cobj},
gitObject: obj,
cast_ptr: (*C.git_blob)(cobj),
}
runtime.SetFinalizer(blob, (*Blob).Free)

19
reference.go
View File

@ -18,11 +18,12 @@ const (
)
type Reference struct {
ptr *C.git_reference
ptr *C.git_reference
repo *Repository
}
func newReferenceFromC(ptr *C.git_reference) *Reference {
ref := &Reference{ptr: ptr}
func newReferenceFromC(ptr *C.git_reference, repo *Repository) *Reference {
ref := &Reference{ptr: ptr, repo: repo}
runtime.SetFinalizer(ref, (*Reference).Free)
return ref
}
@ -52,7 +53,7 @@ func (v *Reference) SetSymbolicTarget(target string, sig *Signature, msg string)
return nil, MakeGitError(ret)
}
return newReferenceFromC(ptr), nil
return newReferenceFromC(ptr, v.repo), nil
}
func (v *Reference) SetTarget(target *Oid, sig *Signature, msg string) (*Reference, error) {
@ -77,7 +78,7 @@ func (v *Reference) SetTarget(target *Oid, sig *Signature, msg string) (*Referen
return nil, MakeGitError(ret)
}
return newReferenceFromC(ptr), nil
return newReferenceFromC(ptr, v.repo), nil
}
func (v *Reference) Resolve() (*Reference, error) {
@ -91,7 +92,7 @@ func (v *Reference) Resolve() (*Reference, error) {
return nil, MakeGitError(ret)
}
return newReferenceFromC(ptr), nil
return newReferenceFromC(ptr, v.repo), nil
}
func (v *Reference) Rename(name string, force bool, sig *Signature, msg string) (*Reference, error) {
@ -119,7 +120,7 @@ func (v *Reference) Rename(name string, force bool, sig *Signature, msg string)
return nil, MakeGitError(ret)
}
return newReferenceFromC(ptr), nil
return newReferenceFromC(ptr, v.repo), nil
}
func (v *Reference) Target() *Oid {
@ -158,7 +159,7 @@ func (v *Reference) Peel(t ObjectType) (Object, error) {
return nil, MakeGitError(err)
}
return allocObject(cobj), nil
return allocObject(cobj, v.repo), nil
}
// Owner returns a weak reference to the repository which owns this
@ -298,7 +299,7 @@ func (v *ReferenceIterator) Next() (*Reference, error) {
return nil, MakeGitError(ret)
}
return newReferenceFromC(ptr), nil
return newReferenceFromC(ptr, v.repo), nil
}
// Free the reference iterator

14
repository.go
View File

@ -130,7 +130,7 @@ func (v *Repository) lookupType(id *Oid, t ObjectType) (Object, error) {
return nil, MakeGitError(ret)
}
return allocObject(ptr), nil
return allocObject(ptr, v), nil
}
func (v *Repository) Lookup(id *Oid) (Object, error) {
@ -177,7 +177,7 @@ func (v *Repository) LookupReference(name string) (*Reference, error) {
return nil, MakeGitError(ecode)
}
return newReferenceFromC(ptr), nil
return newReferenceFromC(ptr, v), nil
}
func (v *Repository) Head() (*Reference, error) {
@ -191,7 +191,7 @@ func (v *Repository) Head() (*Reference, error) {
return nil, MakeGitError(ecode)
}
return newReferenceFromC(ptr), nil
return newReferenceFromC(ptr, v), nil
}
func (v *Repository) SetHead(refname string, sig *Signature, msg string) error {
@ -262,7 +262,7 @@ func (v *Repository) CreateReference(name string, id *Oid, force bool, sig *Sign
return nil, MakeGitError(ecode)
}
return newReferenceFromC(ptr), nil
return newReferenceFromC(ptr, v), nil
}
func (v *Repository) CreateSymbolicReference(name, target string, force bool, sig *Signature, msg string) (*Reference, error) {
@ -293,7 +293,7 @@ func (v *Repository) CreateSymbolicReference(name, target string, force bool, si
return nil, MakeGitError(ecode)
}
return newReferenceFromC(ptr), nil
return newReferenceFromC(ptr, v), nil
}
func (v *Repository) Walk() (*RevWalk, error) {
@ -450,7 +450,7 @@ func (v *Repository) RevparseSingle(spec string) (Object, error) {
return nil, MakeGitError(ecode)
}
return allocObject(ptr), nil
return allocObject(ptr, v), nil
}
// EnsureLog ensures that there is a reflog for the given reference
@ -501,5 +501,5 @@ func (v *Repository) DwimReference(name string) (*Reference, error) {
return nil, MakeGitError(ret)
}
return newReferenceFromC(ptr), nil
return newReferenceFromC(ptr, v), nil
}