summaryrefslogtreecommitdiff
path: root/merge.go
diff options
context:
space:
mode:
authorjoseferminj <[email protected]>2015-01-22 00:44:51 -0500
committerCarlos Martín Nieto <[email protected]>2015-01-29 15:17:46 +0100
commit92a1f92d912cdb5f68da8c1e5e3a4d1ebfd282db (patch)
treeed333eda917e3c7976e427479c04ccbcf6d90777 /merge.go
parenta9d993f3d1400970bfba572747edbee1b57fd221 (diff)
Add TargetDirectory field to Checkout options.
TargetDirectory field indicates a alternative checkout path to workdir.
Diffstat (limited to 'merge.go')
-rw-r--r--merge.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/merge.go b/merge.go
index 3742f97..5b68a8b 100644
--- a/merge.go
+++ b/merge.go
@@ -145,6 +145,7 @@ func (r *Repository) Merge(theirHeads []*AnnotatedCommit, mergeOptions *MergeOpt
cMergeOpts := mergeOptions.toC()
cCheckoutOpts := checkoutOptions.toC()
+ defer freeCheckoutOpts(cCheckoutOpts)
gmerge_head_array := make([]*C.git_annotated_commit, len(theirHeads))
for i := 0; i < len(theirHeads); i++ {