Merge remote-tracking branch 'upstream/master'

1 files changed, 22 insertions, 2 deletions

diff --git a/xmake/modules/devel/git/submodule/update.lua b/xmake/modules/devel/git/submodule/update.lua
index 6256c673f..5d9323a02 100644
--- a/xmake/modules/devel/git/submodule/update.lua
+++ b/xmake/modules/devel/git/submodule/update.lua
@@ -30,8 +30,8 @@ import("lib.detect.find_tool")
 --
 -- import("devel.git.submodule")
 --
--- submodule.update("master", {repodir = "/tmp/xmake", init = true, remote = true})
--- submodule.update("v1.0.1", {repodir = "/tmp/xmake", recursive = true, reference = "xxx", paths = "xxx"})
+-- submodule.update({repodir = "/tmp/xmake", init = true, remote = true})
+-- submodule.update({repodir = "/tmp/xmake", recursive = true, longpaths = true, reference = "xxx", paths = "xxx"})
 --
 -- @endcode
 --
@@ -64,9 +64,29 @@ function main(opt)
         oldir = os.cd(opt.repodir)
     end
 
+    -- enable long paths
+    local longpaths_old
+    local longpaths_changed = false
+    if opt.longpaths then
+        local longpaths_old = try {function () return os.iorunv(git.program, {"config", "--get", "--global", "core.longpaths"}) end}
+        if not longpaths_old or not longpaths_old:find("true") then
+            os.vrunv(git.program, {"config", "--global", "core.longpaths", "true"})
+            longpaths_changed = true
+        end
+    end
+
     -- submodule it
     os.vrunv(git.program, argv)
 
+    -- restore old long paths configuration
+    if longpaths_changed then
+        if longpaths_old and longpaths_old:find("false") then
+            os.vrunv(git.program, {"config", "--global", "core.longpaths", "false"})
+        else
+            os.vrunv(git.program, {"config", "--global", "--unset", "core.longpaths"})
+        end
+    end
+
     -- leave repository directory
     if oldir then
         os.cd(oldir)