Skip to content

Commit 2af282d

Browse files
committed
Addressing PR feedback
1 parent 5f3276c commit 2af282d

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

src/remote.c

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -770,21 +770,14 @@ int git_remote__get_http_proxy(git_remote *remote, bool use_ssl, char **proxy_ur
770770
goto found;
771771
}
772772

773-
/* HTTP_PROXY / HTTPS_PROXY environment variables */
774-
error = git__getenv(&val, use_ssl ? "HTTPS_PROXY" : "HTTP_PROXY");
775-
776-
if (error < 0) {
777-
if (error != GIT_ENOTFOUND) {
778-
return error;
779-
}
773+
/* http_proxy / https_proxy environment variables */
774+
error = git__getenv(&val, use_ssl ? "https_proxy" : "http_proxy");
780775

781-
giterr_clear();
782-
error = 0;
776+
if (error == GIT_ENOTFOUND) {
777+
/* try uppercase environment variables */
778+
error = git__getenv(&val, use_ssl ? "HTTPS_PROXY" : "HTTP_PROXY");
783779
}
784780

785-
/* try lowercase environment variables */
786-
error = git__getenv(&val, use_ssl ? "https_proxy" : "http_proxy");
787-
788781
if (error < 0) {
789782
if (error == GIT_ENOTFOUND) {
790783
giterr_clear();

0 commit comments

Comments
 (0)