refactor: --recursive will always be enabled while initializing or updating submodules

Signed-off-by: leo <[email protected]>

Author: love-linger

src/Commands/Submodule.cs

@@ -43,15 +43,13 @@ public async Task<bool> SetBranchAsync(string path, string branch)
             return await ExecAsync().ConfigureAwait(false);
         }
 
-        public async Task<bool> UpdateAsync(List<string> modules, bool init, bool recursive, bool useRemote = false)
+        public async Task<bool> UpdateAsync(List<string> modules, bool init = false, bool useRemote = false)
         {
             var builder = new StringBuilder();
-            builder.Append("submodule update");
+            builder.Append("submodule update --recursive");
 
             if (init)
                 builder.Append(" --init");
-            if (recursive)
-                builder.Append(" --recursive");
             if (useRemote)
                 builder.Append(" --remote");
             if (modules.Count > 0)

src/Resources/Locales/en_US.axaml

@@ -872,7 +872,6 @@
   <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Update Submodules</x:String>
   <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">All submodules</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Init" xml:space="preserve">Initialize as needed</x:String>
-  <x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">Traverse submodules recursively</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">Submodule:</x:String>
   <x:String x:Key="Text.UpdateSubmodules.UpdateToRemoteTrackingBranch" xml:space="preserve">Update to submodule's remote tracking branch</x:String>
   <x:String x:Key="Text.URL" xml:space="preserve">URL:</x:String>

src/ViewModels/Checkout.cs

@@ -73,7 +73,7 @@ public override async Task<bool> Sure()
                 if (submodules.Count > 0)
                     await new Commands.Submodule(_repo.FullPath)
                         .Use(log)
-                        .UpdateAsync(submodules, false, true);
+                        .UpdateAsync(submodules);
 
                 if (needPopStash)
                     await new Commands.Stash(_repo.FullPath)

src/ViewModels/CheckoutAndFastForward.cs

@@ -78,7 +78,7 @@ public override async Task<bool> Sure()
                 if (submodules.Count > 0)
                     await new Commands.Submodule(_repo.FullPath)
                         .Use(log)
-                        .UpdateAsync(submodules, false, true);
+                        .UpdateAsync(submodules);
 
                 if (needPopStash)
                     await new Commands.Stash(_repo.FullPath)

src/ViewModels/CheckoutCommit.cs

@@ -73,7 +73,7 @@ public override async Task<bool> Sure()
                 if (submodules.Count > 0)
                     await new Commands.Submodule(_repo.FullPath)
                         .Use(log)
-                        .UpdateAsync(submodules, false, true);
+                        .UpdateAsync(submodules);
 
                 if (needPop)
                     await new Commands.Stash(_repo.FullPath)

src/ViewModels/Clone.cs

@@ -144,7 +144,7 @@ public override async Task<bool> Sure()
                 if (submodules.Count > 0)
                     await new Commands.Submodule(path)
                         .Use(log)
-                        .UpdateAsync(submodules, true, true);
+                        .UpdateAsync(submodules, true);
             }
 
             log.Complete();

src/ViewModels/CreateBranch.cs

@@ -157,7 +157,7 @@ public override async Task<bool> Sure()
                     if (submodules.Count > 0)
                         await new Commands.Submodule(_repo.FullPath)
                             .Use(log)
-                            .UpdateAsync(submodules, false, true);
+                            .UpdateAsync(submodules);
 
                     if (needPopStash)
                         await new Commands.Stash(_repo.FullPath)

src/ViewModels/Merge.cs

@@ -95,7 +95,7 @@ public override async Task<bool> Sure()
                 if (submodules.Count > 0)
                     await new Commands.Submodule(_repo.FullPath)
                         .Use(log)
-                        .UpdateAsync(submodules, false, true);
+                        .UpdateAsync(submodules);
             }
 
             log.Complete();

src/ViewModels/Pull.cs

@@ -137,7 +137,7 @@ public override async Task<bool> Sure()
             {
                 var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath, false).GetResultAsync();
                 if (submodules.Count > 0)
-                    await new Commands.Submodule(_repo.FullPath).Use(log).UpdateAsync(submodules, false, true);
+                    await new Commands.Submodule(_repo.FullPath).Use(log).UpdateAsync(submodules);
 
                 if (needPopStash)
                     await new Commands.Stash(_repo.FullPath).Use(log).PopAsync("stash@{0}");

src/ViewModels/UpdateSubmodules.cs

@@ -39,12 +39,6 @@ public bool EnableInit
             set;
         } = true;
 
-        public bool EnableRecursive
-        {
-            get;
-            set;
-        } = true;
-
         public bool EnableRemote
         {
             get;
@@ -93,7 +87,7 @@ public override async Task<bool> Sure()
 
             await new Commands.Submodule(_repo.FullPath)
                 .Use(log)
-                .UpdateAsync(targets, EnableInit, EnableRecursive, EnableRemote);
+                .UpdateAsync(targets, EnableInit, EnableRemote);
 
             log.Complete();
             _repo.MarkSubmodulesDirtyManually();