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

[next] Add stash support #257

Merged
clns merged 5 commits from stash-support into next 2016-03-17 12:14:30 -05:00
Conversation 4 Commits 5 Files Changed 4 +3 -5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5191254a66 - Show all commits

4
stash.go
View File

@ -155,8 +155,6 @@ func DefaultStashApplyOptions() (StashApplyOptions, error) {
if ecode < 0 { if ecode < 0 {
return StashApplyOptions{}, MakeGitError(ecode) return StashApplyOptions{}, MakeGitError(ecode)
} }
defer freeStashApplyOptions(&optsC)
return StashApplyOptions{ return StashApplyOptions{
Flags: StashApplyFlag(optsC.flags), Flags: StashApplyFlag(optsC.flags),
CheckoutOptions: checkoutOptionsFromC(&optsC.checkout_options), CheckoutOptions: checkoutOptionsFromC(&optsC.checkout_options),
@ -174,8 +172,8 @@ func (opts *StashApplyOptions) toC() (
optsC = &C.git_stash_apply_options{ optsC = &C.git_stash_apply_options{
version: C.GIT_STASH_APPLY_OPTIONS_VERSION, version: C.GIT_STASH_APPLY_OPTIONS_VERSION,
flags: C.git_stash_apply_flags(opts.Flags), flags: C.git_stash_apply_flags(opts.Flags),
checkout_options: *opts.CheckoutOptions.toC(),
} }
populateCheckoutOpts(&optsC.checkout_options, &opts.CheckoutOptions)
if opts.ProgressCallback != nil { if opts.ProgressCallback != nil {
C._go_git_setup_stash_apply_progress_callbacks(optsC) C._go_git_setup_stash_apply_progress_callbacks(optsC)
optsC.progress_payload = pointerHandles.Track(progressData) optsC.progress_payload = pointerHandles.Track(progressData)