diff options
| author | Ângelo Andrade Cirino <[email protected]> | 2021-07-15 23:23:48 -0300 |
|---|---|---|
| committer | Ângelo Andrade Cirino <[email protected]> | 2021-07-15 23:23:48 -0300 |
| commit | 81ad292ea67f82d88d785a37d23b1f1603996da1 (patch) | |
| tree | 817b50173948547f7e4b491da271918c67b8a5ff /xmake/modules/devel/git/pull.lua | |
| parent | 942c32f448d9b8a850438aa2af1de2415b7ae872 (diff) | |
| parent | 8c1141aba414c07554179cb28687124514f6e770 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'xmake/modules/devel/git/pull.lua')
| -rw-r--r-- | xmake/modules/devel/git/pull.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/modules/devel/git/pull.lua b/xmake/modules/devel/git/pull.lua index e40707e4e..9970f8dbc 100644 --- a/xmake/modules/devel/git/pull.lua +++ b/xmake/modules/devel/git/pull.lua @@ -66,7 +66,7 @@ function main(opt) -- use proxy? local envs - local proxy_conf = proxy.get() + local proxy_conf = proxy.config() if proxy_conf then -- get proxy configuration from the current remote url local remoteinfo = try { function() return os.iorunv(git.program, {"remote", "-v"}) end } @@ -76,7 +76,7 @@ function main(opt) if #splitinfo > 1 and splitinfo[1] == (opt.remote or "origin") then local url = splitinfo[2] if url then - proxy_conf = proxy.get(url) + proxy_conf = proxy.config(url) end break end |