From 03e10c56391b1d7ca7e2c4e59417500bea2bd242 Mon Sep 17 00:00:00 2001 From: ezwiebel Date: Wed, 14 Sep 2016 14:42:58 +1000 Subject: Fix reference bug introduced with RebaseOptions implementation --- rebase.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'rebase.go') diff --git a/rebase.go b/rebase.go index 464840b..f28c7f6 100644 --- a/rebase.go +++ b/rebase.go @@ -84,12 +84,19 @@ func (ro *RebaseOptions) toC() *C.git_rebase_options { version: C.uint(ro.Version), quiet: C.int(ro.Quiet), inmemory: C.int(ro.InMemory), - rewrite_notes_ref: C.CString(ro.RewriteNotesRef), + rewrite_notes_ref: rewriteNotesRefToC(ro.RewriteNotesRef), merge_options: *ro.MergeOptions.toC(), checkout_options: *ro.CheckoutOptions.toC(), } } +func rewriteNotesRefToC(ref string) *C.char { + if ref == "" { + return nil + } + return C.CString(ref) +} + // Rebase object wrapper for C pointer type Rebase struct { ptr *C.git_rebase -- cgit v1.2.3