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

rebase: Add wrapper for git_rebase_inmemory_index() #900

Merged
pks-t merged 2 commits from pks-rebase-inmemory-index into main 2022-02-24 07:27:26 -06:00
Conversation 0 Commits 2 Files Changed 2 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 25c1b4b0e8 - Show all commits

8
rebase.go
View File

@ -318,7 +318,7 @@ func (r *Repository) InitRebase(branch *AnnotatedCommit, upstream *AnnotatedComm
return nil, MakeGitError(ret) return nil, MakeGitError(ret)
} }
return newRebaseFromC(ptr, cOpts), nil return newRebaseFromC(ptr, r, cOpts), nil
} }
// OpenRebase opens an existing rebase that was previously started by either an invocation of InitRebase or by another client. // OpenRebase opens an existing rebase that was previously started by either an invocation of InitRebase or by another client.
@ -340,7 +340,7 @@ func (r *Repository) OpenRebase(opts *RebaseOptions) (*Rebase, error) {
return nil, MakeGitError(ret) return nil, MakeGitError(ret)
} }
return newRebaseFromC(ptr, cOpts), nil return newRebaseFromC(ptr, r, cOpts), nil
} }
// OperationAt gets the rebase operation specified by the given index. // OperationAt gets the rebase operation specified by the given index.
@ -457,8 +457,8 @@ func (r *Rebase) Free() {
freeRebaseOptions(r.options) freeRebaseOptions(r.options)
} }
func newRebaseFromC(ptr *C.git_rebase, opts *C.git_rebase_options) *Rebase { func newRebaseFromC(ptr *C.git_rebase, repo *Repository, opts *C.git_rebase_options) *Rebase {
rebase := &Rebase{ptr: ptr, options: opts} rebase := &Rebase{ptr: ptr, r: repo, options: opts}
runtime.SetFinalizer(rebase, (*Rebase).Free) runtime.SetFinalizer(rebase, (*Rebase).Free)
return rebase return rebase
} }