Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
66a530eb
Commit
66a530eb
authored
9 years ago
by
Carlos Martín Nieto
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3648 from libgit2/cmn/auth-retry
test: make sure we retry the auth callback on all platforms
parents
778fb695
ba9bb664
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
4 deletions
+17
-4
CMakeLists.txt
+4
-0
appveyor.yml
+5
-1
script/cibuild.sh
+5
-1
src/transports/winhttp.c
+3
-2
No files found.
CMakeLists.txt
View file @
66a530eb
...
...
@@ -682,6 +682,10 @@ IF (BUILD_CLAR)
ELSE ()
ADD_TEST(libgit2_clar libgit2_clar -v)
ENDIF ()
# Add a test target which runs the cred callback tests, to be
# called after setting the url and user
ADD_TEST(libgit2_clar-cred_callback libgit2_clar -v -sonline::clone::cred_callback)
ENDIF ()
IF (TAGS)
...
...
This diff is collapsed.
Click to expand it.
appveyor.yml
View file @
66a530eb
...
...
@@ -36,4 +36,8 @@ build_script:
-
cmd
:
|
if "%GENERATOR%"=="MSYS Makefiles" (C:\MinGW\msys\1.0\bin\sh --login /c/projects/libgit2/script/appveyor-mingw.sh)
test_script
:
-
ps
:
ctest -V .
-
ps
:
|
ctest -V -R libgit2_clar
$env:GITTEST_REMOTE_URL="https://github.com/libgit2/non-existent"
$env:GITTEST_REMOTE_USER="libgit2test"
ctest -V -R libgit2_clar-cred_callback
This diff is collapsed.
Click to expand it.
script/cibuild.sh
View file @
66a530eb
...
...
@@ -25,7 +25,7 @@ git daemon --listen=localhost --export-all --enable=receive-pack --base-path="$H
export
GITTEST_REMOTE_URL
=
"git://localhost/test.git"
# Run the test suite
ctest
-V
.
||
exit
$?
ctest
-V
-R
libgit2_clar
||
exit
$?
# Now that we've tested the raw git protocol, let's set up ssh to we
# can do the push tests over it
...
...
@@ -56,3 +56,7 @@ if [ -e ./libgit2_clar ]; then
./libgit2_clar
-sonline
::clone::cred_callback
||
exit
$?
fi
fi
export
GITTEST_REMOTE_URL
=
"https://github.com/libgit2/non-existent"
export
GITTEST_REMOTE_USER
=
"libgit2test"
ctest
-V
-R
libgit2_clar-cred_callback
This diff is collapsed.
Click to expand it.
src/transports/winhttp.c
View file @
66a530eb
...
...
@@ -926,10 +926,11 @@ replay:
if
(
parse_unauthorized_response
(
s
->
request
,
&
allowed_types
,
&
t
->
auth_mechanism
)
<
0
)
return
-
1
;
if
(
allowed_types
&&
(
!
t
->
cred
||
0
==
(
t
->
cred
->
credtype
&
allowed_types
)))
{
if
(
allowed_types
)
{
int
cred_error
=
1
;
git_cred_free
(
t
->
cred
);
t
->
cred
=
NULL
;
/* Start with the user-supplied credential callback, if present */
if
(
t
->
owner
->
cred_acquire_cb
)
{
cred_error
=
t
->
owner
->
cred_acquire_cb
(
&
t
->
cred
,
t
->
owner
->
url
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment