add submodule clean

2 files changed, 17 insertions, 0 deletions

diff --git a/xmake/modules/private/action/require/impl/actions/download.lua b/xmake/modules/private/action/require/impl/actions/download.lua
index 2275c96f7..d5889ea9c 100644
--- a/xmake/modules/private/action/require/impl/actions/download.lua
+++ b/xmake/modules/private/action/require/impl/actions/download.lua
@@ -45,6 +45,11 @@ function _checkout(package, url, sourcedir, url_alias)
         git.clean({repodir = packagedir, force = true, all = true})
         -- reset the previous modified files
         git.reset({repodir = packagedir, hard = true})
+        -- clean and reset submodules
+        if os.isfile(path.join(packagedir, ".gitmodules")) then
+            git.submodule.clean({repodir = packagedir, force = true, all = true})
+            git.submodule.reset({repodir = packagedir, hard = true})
+        end
         tty.erase_line_to_start().cr()
         return
     end
@@ -54,6 +59,10 @@ function _checkout(package, url, sourcedir, url_alias)
     if localdir and os.isdir(localdir) then
         git.clean({repodir = localdir, force = true, all = true})
         git.reset({repodir = localdir, hard = true})
+        if os.isfile(path.join(localdir, ".gitmodules")) then
+            git.submodule.clean({repodir = localdir, force = true, all = true})
+            git.submodule.reset({repodir = localdir, hard = true})
+        end
         os.cp(localdir, packagedir)
         tty.erase_line_to_start().cr()
         return
diff --git a/xmake/modules/private/action/require/impl/actions/download_resources.lua b/xmake/modules/private/action/require/impl/actions/download_resources.lua
index c6af29151..771a733e4 100644
--- a/xmake/modules/private/action/require/impl/actions/download_resources.lua
+++ b/xmake/modules/private/action/require/impl/actions/download_resources.lua
@@ -44,6 +44,10 @@ function _checkout(package, resource_name, resource_url, resource_revision)
         git.clean({repodir = resourcedir, force = true, all = true})
         -- reset the previous modified files
         git.reset({repodir = resourcedir, hard = true})
+        if os.isfile(path.join(resourcedir, ".gitmodules")) then
+            git.submodule.clean({repodir = resourcedir, force = true, all = true})
+            git.submodule.reset({repodir = resourcedir, hard = true})
+        end
         return
     end
 
@@ -52,6 +56,10 @@ function _checkout(package, resource_name, resource_url, resource_revision)
     if localdir and os.isdir(localdir) then
         git.clean({repodir = localdir, force = true, all = true})
         git.reset({repodir = localdir, hard = true})
+        if os.isfile(path.join(localdir, ".gitmodules")) then
+            git.submodule.clean({repodir = localdir, force = true, all = true})
+            git.submodule.reset({repodir = localdir, hard = true})
+        end
         os.cp(localdir, resourcedir)
         return
     end