From 34fb7e03ecfd3fbe7000ecfac4e30ea719d9879e Mon Sep 17 00:00:00 2001
From: Calin Seciu <calinseciu@gmail.com>
Date: Thu, 17 Sep 2015 17:07:34 +0300
Subject: [PATCH 1/2] Fix crash when using Pathspec in StatusOptions

Using `StatusOptions.Pathspec` results in a fatal error panic with
the message 'unexpected signal during runtime execution'.

This is because the `&cpathspec` C.git_strarray gets freed in
`*StatusOptions.toC()` before being passed to
`C.git_status_init_options()` in `*Repository.StatusList()`
(see https://github.com/libgit2/git2go/blob/b3e7705c48f038ef335204a2a9e1ee829784c30e/status.go#L138)

The relevant panic trace is:

```
fatal error: unexpected signal during runtime execution
[signal 0xb code=0x1 addr=0xb01dfacedebac1e pc=0x4062609]

runtime stack:
runtime.throw(0x469a080, 0x2a)
    /usr/local/Cellar/go/1.5.1/libexec/src/runtime/panic.go:527 +0x90
runtime.sigpanic()
    /usr/local/Cellar/go/1.5.1/libexec/src/runtime/sigpanic_unix.go:12
+0x5a

goroutine 71 [syscall, locked to thread]:
runtime.cgocall(0x400a720, 0xc8204e9998, 0x0)
    /usr/local/Cellar/go/1.5.1/libexec/src/runtime/cgocall.go:120 +0x11b
fp=0xc8204e9968 sp=0xc8204e9938
github.com/libgit2/git2go._Cfunc_git_status_list_new(0xc8204c39c8,
0x5e17780, 0xc820478c40, 0xc800000000)
    ??:0 +0x39 fp=0xc8204e9998 sp=0xc8204e9968
github.com/libgit2/git2go.(*Repository).StatusList(0xc820013290,
0xc8204e9b58, 0x0, 0x0, 0x0)
    /Users/calin/go/src/github.com/libgit2/git2go/status.go:168 +0x11d
fp=0xc8204e99e8 sp=0xc8204e9998
```
---
 status.go | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/status.go b/status.go
index 3f5a06d..068a474 100644
--- a/status.go
+++ b/status.go
@@ -126,34 +126,24 @@ type StatusOptions struct {
 	Pathspec []string
 }
 
-func (opts *StatusOptions) toC() *C.git_status_options {
-	if opts == nil {
-		return nil
-	}
-
-	cpathspec := C.git_strarray{}
-	if opts.Pathspec != nil {
-		cpathspec.count = C.size_t(len(opts.Pathspec))
-		cpathspec.strings = makeCStringsFromStrings(opts.Pathspec)
-		defer freeStrarray(&cpathspec)
-	}
-
-	copts := &C.git_status_options{
-		version:  C.GIT_STATUS_OPTIONS_VERSION,
-		show:     C.git_status_show_t(opts.Show),
-		flags:    C.uint(opts.Flags),
-		pathspec: cpathspec,
-	}
-
-	return copts
-}
-
 func (v *Repository) StatusList(opts *StatusOptions) (*StatusList, error) {
 	var ptr *C.git_status_list
 	var copts *C.git_status_options
 
 	if opts != nil {
-		copts = opts.toC()
+		cpathspec := C.git_strarray{}
+		if opts.Pathspec != nil {
+			cpathspec.count = C.size_t(len(opts.Pathspec))
+			cpathspec.strings = makeCStringsFromStrings(opts.Pathspec)
+			defer freeStrarray(&cpathspec)
+		}
+
+		copts = &C.git_status_options{
+			version:  C.GIT_STATUS_OPTIONS_VERSION,
+			show:     C.git_status_show_t(opts.Show),
+			flags:    C.uint(opts.Flags),
+			pathspec: cpathspec,
+		}
 	} else {
 		copts = &C.git_status_options{}
 		ret := C.git_status_init_options(copts, C.GIT_STATUS_OPTIONS_VERSION)
-- 
2.45.2


From 9397af0854575913f72b10a7ebf474ef023e2e69 Mon Sep 17 00:00:00 2001
From: Jose Alvarez <josefermin@google.com>
Date: Wed, 16 Sep 2015 16:08:37 -0400
Subject: [PATCH 2/2] Expose baseline field in CheckoutOptions

---
 checkout.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/checkout.go b/checkout.go
index e0c067e..a2e312b 100644
--- a/checkout.go
+++ b/checkout.go
@@ -44,7 +44,8 @@ type CheckoutOpts struct {
 	FileMode        os.FileMode      // Default is 0644 or 0755 as dictated by blob
 	FileOpenFlags   int              // Default is O_CREAT | O_TRUNC | O_WRONLY
 	TargetDirectory string           // Alternative checkout path to workdir
-	Paths			[]string
+	Paths           []string
+	Baseline        *Tree
 }
 
 func checkoutOptionsFromC(c *C.git_checkout_options) CheckoutOpts {
@@ -90,6 +91,10 @@ func populateCheckoutOpts(ptr *C.git_checkout_options, opts *CheckoutOpts) *C.gi
 		ptr.paths.count = C.size_t(len(opts.Paths))
 	}
 
+	if opts.Baseline != nil {
+		ptr.baseline = opts.Baseline.cast_ptr
+	}
+
 	return ptr
 }
 
@@ -156,4 +161,4 @@ func (v *Repository) CheckoutTree(tree *Tree, opts *CheckoutOpts) error {
 	}
 
 	return nil
-}
\ No newline at end of file
+}
-- 
2.45.2