diff options
| author | John Cai <jcai@gitlab.com> | 2019-01-10 20:42:25 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-01-10 20:42:25 +0300 |
| commit | f5732c949835d75280fe1f485cfbbd6051b125c8 (patch) | |
| tree | c0b77725c12e8e3bbee0e045536c88789c6352c5 | |
| parent | 4e0ebbbecf351c0815778d713798c69a08af6e60 (diff) | |
| parent | 64d0001e625694da1c680a69302c550fbb4f4cd5 (diff) | |
Merge branch 'client-fixes' into 'master'
Small refactors to gitaly/client
See merge request gitlab-org/gitaly!1034
| -rw-r--r-- | changelogs/unreleased/client-fixes.yml | 5 | ||||
| -rw-r--r-- | client/pool_darwin.go (renamed from client/pool-darwin.go) | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/changelogs/unreleased/client-fixes.yml b/changelogs/unreleased/client-fixes.yml new file mode 100644 index 000000000..06fc2a151 --- /dev/null +++ b/changelogs/unreleased/client-fixes.yml @@ -0,0 +1,5 @@ +--- +title: Small refactors to gitaly/client +merge_request: 1034 +author: +type: other diff --git a/client/pool-darwin.go b/client/pool_darwin.go index e392a4d70..62589ce28 100644 --- a/client/pool-darwin.go +++ b/client/pool_darwin.go @@ -1,5 +1,3 @@ -// +build darwin - package client import ( @@ -13,7 +11,6 @@ import ( // SSL_CERT_{DIR,FILE}. func systemCertPool() (*x509.CertPool, error) { var certPem []byte - count := 0 if f := os.Getenv("SSL_CERT_FILE"); len(f) > 0 { pem, err := ioutil.ReadFile(f) @@ -23,7 +20,6 @@ func systemCertPool() (*x509.CertPool, error) { pem = append(pem, '\n') certPem = append(certPem, pem...) - count++ } if d := os.Getenv("SSL_CERT_DIR"); len(d) > 0 { @@ -44,7 +40,6 @@ func systemCertPool() (*x509.CertPool, error) { pem = append(pem, '\n') certPem = append(certPem, pem...) - count++ } } |