Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LibGit2: add resolve_url to RemoteCallbacksStruct for LibGit2 0.99.0 #35232

Merged
merged 3 commits into from
May 29, 2020
+10 −2
Merged

LibGit2: add resolve_url to RemoteCallbacksStruct for LibGit2 0.99.0 #35232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98fa2f3
LibGit2: add resolve_url to RemoteCallbacksStruct for LibGit2 0.99.0
diabonas Mar 23, 2020
375f838
LibGit2: update error message checking for LibGit2 0.99.0
diabonas Mar 23, 2020
75b8e14
LibGit2: amend GitError enum
nalimilan Mar 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion stdlib/LibGit2/src/error.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,12 @@ export GitError
Callback,
CherryPick,
Describe,
Rebase)
Rebase,
Filesystem,
Patch,
WorkTree,
SHA1,
HTTP)

struct ErrorStruct
message::Ptr{UInt8}
Expand Down
3 changes: 3 additions & 0 deletions stdlib/LibGit2/src/types.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,9 @@ end
push_negotiation::Ptr{Cvoid} = C_NULL
transport::Ptr{Cvoid} = C_NULL
payload::Ptr{Cvoid} = C_NULL
@static if LibGit2.VERSION >= v"0.99.0"
resolve_url::Ptr{Cvoid} = C_NULL
end
end

"""
Expand Down
2 changes: 1 addition & 1 deletion stdlib/LibGit2/test/libgit2.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3048,7 +3048,7 @@ mktempdir() do dir
deserialize(f)
end
@test err.code == LibGit2.Error.ERROR
@test lowercase(err.msg) == lowercase("invalid Content-Type: text/plain")
@test occursin(r"invalid content-type: '?text/plain'?"i, err.msg)
end

# OpenSSL s_server should still be running
Expand Down