summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2015-12-14 13:54:02 -0600
committerEdward Thomson <ethomson@edwardthomson.com>2015-12-14 13:54:02 -0600
commit7f2c1469f8565fa8809c03aa7aa0ffae90a99c66 (patch)
tree576b615938e842adbb8a6af315d09b5635b9e785
parent30c8e26074925fde4e2a0a6f5bb6a5a0398c277f (diff)
parentefd9ab568b8b56e422e0497badd0368948fba590 (diff)
downloadlibgit2-7f2c1469f8565fa8809c03aa7aa0ffae90a99c66.tar.gz
Merge pull request #3528 from chescock/Passthrough-from-credential-callback
Treat GIT_PASSTHROUGH as though git_cred_acquire_cb isn't set.
-rw-r--r--src/transports/winhttp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/transports/winhttp.c b/src/transports/winhttp.c
index 77d939bd3..9e97a279d 100644
--- a/src/transports/winhttp.c
+++ b/src/transports/winhttp.c
@@ -930,7 +930,10 @@ replay:
cred_error = t->owner->cred_acquire_cb(&t->cred, t->owner->url,
t->connection_data.user, allowed_types, t->owner->cred_acquire_payload);
- if (cred_error < 0)
+ /* Treat GIT_PASSTHROUGH as though git_cred_acquire_cb isn't set */
+ if (cred_error == GIT_PASSTHROUGH)
+ cred_error = 1;
+ else if (cred_error < 0)
return cred_error;
}