improve git fsmonitor

9 files changed, 50 insertions, 19 deletions

diff --git a/xmake/modules/devel/git/checkout.lua b/xmake/modules/devel/git/checkout.lua
index 65ea1e820..61919e422 100644
--- a/xmake/modules/devel/git/checkout.lua
+++ b/xmake/modules/devel/git/checkout.lua
@@ -40,10 +40,12 @@ function main(commit, opt)
     opt = opt or {}
     local git = assert(find_tool("git"), "git not found!")
     local argv = {}
-
-    if opt.fsmonitor ~= nil then
+    if opt.fsmonitor then
+        table.insert(argv, "-c")
+        table.insert(argv, "core.fsmonitor=true")
+    else
         table.insert(argv, "-c")
-        table.insert(argv, "core.fsmonitor=" .. tostring(opt.fsmonitor))
+        table.insert(argv, "core.fsmonitor=false")
     end
 
     table.insert(argv, "checkout")
diff --git a/xmake/modules/devel/git/clean.lua b/xmake/modules/devel/git/clean.lua
index 20265687b..91b6b5c82 100644
--- a/xmake/modules/devel/git/clean.lua
+++ b/xmake/modules/devel/git/clean.lua
@@ -45,9 +45,12 @@ function main(opt)
 
     -- init argv
     local argv = {}
-    if opt.fsmonitor ~= nil then
+    if opt.fsmonitor then
         table.insert(argv, "-c")
-        table.insert(argv, "core.fsmonitor=" .. tostring(opt.fsmonitor))
+        table.insert(argv, "core.fsmonitor=true")
+    else
+        table.insert(argv, "-c")
+        table.insert(argv, "core.fsmonitor=false")
     end
     table.insert(argv, "clean")
     table.insert(argv, "-d")
diff --git a/xmake/modules/devel/git/clone.lua b/xmake/modules/devel/git/clone.lua
index f821b8b24..58f43462d 100644
--- a/xmake/modules/devel/git/clone.lua
+++ b/xmake/modules/devel/git/clone.lua
@@ -78,9 +78,12 @@ function main(url, opt)
     end
 
     -- set fsmonitor
-    if opt.fsmonitor ~= nil then
+    if opt.fsmonitor then
         table.insert(argv, "-c")
-        table.insert(argv, "core.fsmonitor=" .. tostring(opt.fsmonitor))
+        table.insert(argv, "core.fsmonitor=true")
+    else
+        table.insert(argv, "-c")
+        table.insert(argv, "core.fsmonitor=false")
     end
 
     -- set outputdir
diff --git a/xmake/modules/devel/git/pull.lua b/xmake/modules/devel/git/pull.lua
index c5f1f6a55..a9923bb18 100644
--- a/xmake/modules/devel/git/pull.lua
+++ b/xmake/modules/devel/git/pull.lua
@@ -46,9 +46,12 @@ function main(opt)
 
     -- init argv
     local argv = {}
-    if opt.fsmonitor ~= nil then
+    if opt.fsmonitor then
         table.insert(argv, "-c")
-        table.insert(argv, "core.fsmonitor=" .. tostring(opt.fsmonitor))
+        table.insert(argv, "core.fsmonitor=true")
+    else
+        table.insert(argv, "-c")
+        table.insert(argv, "core.fsmonitor=false")
     end
     table.insert(argv, "pull")
 
diff --git a/xmake/modules/devel/git/push.lua b/xmake/modules/devel/git/push.lua
index b56ea4059..02585f020 100644
--- a/xmake/modules/devel/git/push.lua
+++ b/xmake/modules/devel/git/push.lua
@@ -39,8 +39,16 @@ import("branch", {alias = "git_branch"})
 function main(url, opt)
     opt = opt or {}
     local git = assert(find_tool("git"), "git not found!")
-
-    local argv = {"push", url}
+    local argv = {}
+    if opt.fsmonitor then
+        table.insert(argv, "-c")
+        table.insert(argv, "core.fsmonitor=true")
+    else
+        table.insert(argv, "-c")
+        table.insert(argv, "core.fsmonitor=false")
+    end
+    table.insert(argv, "push")
+    table.insert(argv, url)
     if opt.force then
         table.insert(argv, "--force")
     end
diff --git a/xmake/modules/devel/git/reset.lua b/xmake/modules/devel/git/reset.lua
index e9fbe6c30..ba1a0f139 100644
--- a/xmake/modules/devel/git/reset.lua
+++ b/xmake/modules/devel/git/reset.lua
@@ -45,9 +45,12 @@ function main(opt)
 
     -- init argv
     local argv = {}
-    if opt.fsmonitor ~= nil then
+    if opt.fsmonitor then
         table.insert(argv, "-c")
-        table.insert(argv, "core.fsmonitor=" .. tostring(opt.fsmonitor))
+        table.insert(argv, "core.fsmonitor=true")
+    else
+        table.insert(argv, "-c")
+        table.insert(argv, "core.fsmonitor=false")
     end
     table.insert(argv, "reset")
 
diff --git a/xmake/modules/devel/git/submodule/clean.lua b/xmake/modules/devel/git/submodule/clean.lua
index c1817257c..622dff3e7 100644
--- a/xmake/modules/devel/git/submodule/clean.lua
+++ b/xmake/modules/devel/git/submodule/clean.lua
@@ -45,9 +45,12 @@ function main(opt)
 
     -- init argv
     local argv = {}
-    if opt.fsmonitor ~= nil then
+    if opt.fsmonitor then
         table.insert(argv, "-c")
-        table.insert(argv, "core.fsmonitor=" .. tostring(opt.fsmonitor))
+        table.insert(argv, "core.fsmonitor=true")
+    else
+        table.insert(argv, "-c")
+        table.insert(argv, "core.fsmonitor=false")
     end
     table.join2(argv, "submodule", "foreach", "--recursive", "git", "clean", "-d")
 
diff --git a/xmake/modules/devel/git/submodule/reset.lua b/xmake/modules/devel/git/submodule/reset.lua
index 1095310e7..e0c7bf98d 100644
--- a/xmake/modules/devel/git/submodule/reset.lua
+++ b/xmake/modules/devel/git/submodule/reset.lua
@@ -45,9 +45,12 @@ function main(opt)
 
     -- init argv
     local argv = {}
-    if opt.fsmonitor ~= nil then
+    if opt.fsmonitor then
         table.insert(argv, "-c")
-        table.insert(argv, "core.fsmonitor=" .. tostring(opt.fsmonitor))
+        table.insert(argv, "core.fsmonitor=true")
+    else
+        table.insert(argv, "-c")
+        table.insert(argv, "core.fsmonitor=false")
     end
     table.join2(argv, "submodule", "foreach", "--recursive", "git", "reset")
 
diff --git a/xmake/modules/devel/git/submodule/update.lua b/xmake/modules/devel/git/submodule/update.lua
index d81495a88..ee24bffcf 100644
--- a/xmake/modules/devel/git/submodule/update.lua
+++ b/xmake/modules/devel/git/submodule/update.lua
@@ -45,9 +45,12 @@ function main(opt)
 
     -- init argv
     local argv = {}
-    if opt.fsmonitor ~= nil then
+    if opt.fsmonitor then
         table.insert(argv, "-c")
-        table.insert(argv, "core.fsmonitor=" .. tostring(opt.fsmonitor))
+        table.insert(argv, "core.fsmonitor=true")
+    else
+        table.insert(argv, "-c")
+        table.insert(argv, "core.fsmonitor=false")
     end
     table.insert(argv, "submodule")
     table.insert(argv, "update")