Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: CI

on:
pull_request:
branches:
- master
push:
branches:
- master
Expand Down
13 changes: 9 additions & 4 deletions src/git_function.jl
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,15 @@
path = split(get(ENV, "PATH", ""), pathsep)
libpath = split(get(ENV, LIBPATH_env, ""), pathsep)

path = vcat(dirname(OpenSSH_jll.ssh_path), path)
libpath = vcat(OpenSSH_jll.LIBPATH_list, libpath)
path = vcat(dirname(Git_jll.git_path), path)
libpath = vcat(Git_jll.LIBPATH_list, libpath)
@static if Sys.iswindows()

Check warning on line 59 in src/git_function.jl

View check run for this annotation

Codecov / codecov/patch

src/git_function.jl#L59

Added line #L59 was not covered by tests
# Windows: we append OpenSSH_jll to the end of PATH
path = vcat(dirname(Git_jll.git_path), path, dirname(OpenSSH_jll.ssh_path))
libpath = vcat(Git_jll.LIBPATH_list, libpath, OpenSSH_jll.LIBPATH_list)
else
# All other platforms: we prepend OpenSSH_jll to the begining of PATH
path = vcat(dirname(Git_jll.git_path), dirname(OpenSSH_jll.ssh_path), path)
libpath = vcat(Git_jll.LIBPATH_list, OpenSSH_jll.LIBPATH_list, libpath)
end

unique!(filter!(!isempty, path))
unique!(filter!(!isempty, libpath))
Expand Down
Loading