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

github-actions[bot] · au2001 · web-flow · commit a8009473795b · 2022-01-17T19:05:54.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
@@ -291,6 +291,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 {
@@ -991,6 +994,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
 }
 
@@ -1000,6 +1004,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
`@@ -291,6 +291,9 @@ type PushOptions struct {`
`291`	`291`
`292`	`292`	`// Headers are extra headers for the push operation.`
`293`	`293`	`Headers []string`
	`294`	`+`
	`295`	`+ // Proxy options to use for this push operation`
	`296`	`+ ProxyOptions ProxyOptions`
`294`	`297`	`}`
`295`	`298`
`296`	`299`	`type RemoteHead struct {`
`@@ -991,6 +994,7 @@ func populatePushOptions(copts C.git_push_options, opts PushOptions, errorTarg`
`991`	`994`	`strings: makeCStringsFromStrings(opts.Headers),`
`992`	`995`	`}`
`993`	`996`	`populateRemoteCallbacks(&copts.callbacks, &opts.RemoteCallbacks, errorTarget)`
	`997`	`+ populateProxyOptions(&copts.proxy_opts, &opts.ProxyOptions)`
`994`	`998`	`return copts`
`995`	`999`	`}`
`996`	`1000`
`@@ -1000,6 +1004,7 @@ func freePushOptions(copts *C.git_push_options) {`
`1000`	`1004`	`}`
`1001`	`1005`	`untrackCallbacksPayload(&copts.callbacks)`
`1002`	`1006`	`freeStrarray(&copts.custom_headers)`
	`1007`	`+ freeProxyOptions(&copts.proxy_opts)`
`1003`	`1008`	`}`
`1004`	`1009`
`1005`	`1010`	`// Fetch performs a fetch operation. refspecs specifies which refspecs`