FetchOptions: don't embed the ProxyOptions
Rather than embeding the ProxyOptions struct add a member to the struct. Also use a value rather than a pointer, so that the zero value of FetchOptions is well defined.
This commit is contained in:
parent
d5229e6af8
commit
db78e55d45
|
@ -119,7 +119,7 @@ type FetchOptions struct {
|
|||
Headers []string
|
||||
|
||||
// Proxy options to use for this fetch operation
|
||||
*ProxyOptions
|
||||
ProxyOptions ProxyOptions
|
||||
}
|
||||
|
||||
type ProxyType uint
|
||||
|
@ -698,7 +698,7 @@ func populateFetchOptions(options *C.git_fetch_options, opts *FetchOptions) {
|
|||
options.custom_headers.count = C.size_t(len(opts.Headers))
|
||||
options.custom_headers.strings = makeCStringsFromStrings(opts.Headers)
|
||||
options.proxy_opts = C.git_proxy_options{}
|
||||
populateProxyOptions(&options.proxy_opts, opts.ProxyOptions)
|
||||
populateProxyOptions(&options.proxy_opts, &opts.ProxyOptions)
|
||||
}
|
||||
|
||||
func populatePushOptions(options *C.git_push_options, opts *PushOptions) {
|
||||
|
|
Loading…
Reference in New Issue