Add ProxyOptions for push operations (#872) (#883)

github-actions[bot] · au2001 · web-flow · commit d0ff27733f61 · 2022-01-17T19:07:37.000-08:00
Analog to #623 but for push operations rather than fetch. (cherry picked from commit 5eca48c) Co-authored-by: Aurélien <6292584+au2001@users.noreply.github.com>
diff --git a/remote.go b/remote.go
@@ -270,6 +270,9 @@ type PushOptions struct {
 
 	// Headers are extra headers for the push operation.
 	Headers []string
+
+	// Proxy options to use for this push operation
+	ProxyOptions ProxyOptions
 }
 
 type RemoteHead struct {
@@ -945,6 +948,7 @@ func populatePushOptions(copts *C.git_push_options, opts *PushOptions, errorTarg
 		strings: makeCStringsFromStrings(opts.Headers),
 	}
 	populateRemoteCallbacks(&copts.callbacks, &opts.RemoteCallbacks, errorTarget)
+	populateProxyOptions(&copts.proxy_opts, &opts.ProxyOptions)
 	return copts
 }
 
@@ -954,6 +958,7 @@ func freePushOptions(copts *C.git_push_options) {
 	}
 	untrackCallbacksPayload(&copts.callbacks)
 	freeStrarray(&copts.custom_headers)
+	freeProxyOptions(&copts.proxy_opts)
 }
 
 // Fetch performs a fetch operation. refspecs specifies which refspecs

Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,9 @@ type PushOptions struct {`
`270`	`270`
`271`	`271`	`// Headers are extra headers for the push operation.`
`272`	`272`	`Headers []string`
	`273`	`+`
	`274`	`+ // Proxy options to use for this push operation`
	`275`	`+ ProxyOptions ProxyOptions`
`273`	`276`	`}`
`274`	`277`
`275`	`278`	`type RemoteHead struct {`
`@@ -945,6 +948,7 @@ func populatePushOptions(copts C.git_push_options, opts PushOptions, errorTarg`
`945`	`948`	`strings: makeCStringsFromStrings(opts.Headers),`
`946`	`949`	`}`
`947`	`950`	`populateRemoteCallbacks(&copts.callbacks, &opts.RemoteCallbacks, errorTarget)`
	`951`	`+ populateProxyOptions(&copts.proxy_opts, &opts.ProxyOptions)`
`948`	`952`	`return copts`
`949`	`953`	`}`
`950`	`954`
`@@ -954,6 +958,7 @@ func freePushOptions(copts *C.git_push_options) {`
`954`	`958`	`}`
`955`	`959`	`untrackCallbacksPayload(&copts.callbacks)`
`956`	`960`	`freeStrarray(&copts.custom_headers)`
	`961`	`+ freeProxyOptions(&copts.proxy_opts)`
`957`	`962`	`}`
`958`	`963`
`959`	`964`	`// Fetch performs a fetch operation. refspecs specifies which refspecs`