summaryrefslogtreecommitdiff
path: root/xmake/modules/devel/git/pull.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2021-04-23 22:52:16 +0800
committerruki <[email protected]>2021-04-23 22:52:16 +0800
commitef17fec2bc80c6ec4ad537e74748762d18e92606 (patch)
tree942101eedb185802da7b29c948ed8fd14d501911 /xmake/modules/devel/git/pull.lua
parent99a6f5326cecd709c2927b6f50efb59a9a50c4a0 (diff)
improve proxy to support mirror url
Diffstat (limited to 'xmake/modules/devel/git/pull.lua')
-rw-r--r--xmake/modules/devel/git/pull.lua4
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