From 9ea9d18a4dafae163411f601338de9c49209df1c Mon Sep 17 00:00:00 2001
From: ZCShou <ZCShou@live.com>
Date: Thu, 30 Jul 2020 13:59:12 +0800
Subject: [PATCH] =?UTF-8?q?<fix>(*):=20=E6=92=A4=E9=94=80=E4=BA=86=20commi?=
 =?UTF-8?q?t=20ceff6ef1021b7ad59ddecc1e3f1f66a743d2b522?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SourceGit/Git/Remote.cs     |  2 +-
 SourceGit/Git/Repository.cs | 15 ++++++---------
 SourceGit/SourceGit.csproj  |  2 +-
 SourceGit/UI/Fetch.xaml     | 16 ++++------------
 SourceGit/UI/Fetch.xaml.cs  | 13 ++-----------
 SourceGit/UI/Pull.xaml      | 16 ++++------------
 SourceGit/UI/Pull.xaml.cs   | 11 +----------
 SourceGit/UI/Push.xaml      | 17 ++++-------------
 SourceGit/UI/Push.xaml.cs   | 16 ++--------------
 9 files changed, 25 insertions(+), 83 deletions(-)

diff --git a/SourceGit/Git/Remote.cs b/SourceGit/Git/Remote.cs
index 1d1ade87..ed32e810 100644
--- a/SourceGit/Git/Remote.cs
+++ b/SourceGit/Git/Remote.cs
@@ -57,7 +57,7 @@ namespace SourceGit.Git {
             if (errs != null) {
                 App.RaiseError(errs);
             } else {
-                repo.Fetch(new Remote() { Name = name }, "--recurse-submodules=on-demand", true, null);
+                repo.Fetch(new Remote() { Name = name }, true, null);
             }
         }
 
diff --git a/SourceGit/Git/Repository.cs b/SourceGit/Git/Repository.cs
index a50bbfb7..087ed5f4 100644
--- a/SourceGit/Git/Repository.cs
+++ b/SourceGit/Git/Repository.cs
@@ -455,13 +455,12 @@ namespace SourceGit.Git {
         ///     Fetch remote changes
         /// </summary>
         /// <param name="remote"></param>
-        /// <param name="submod">submod</param>
         /// <param name="prune"></param>
         /// <param name="onProgress"></param>
-        public void Fetch(Remote remote, string submod, bool prune, Action<string> onProgress) {
+        public void Fetch(Remote remote, bool prune, Action<string> onProgress) {
             isWatcherDisabled = true;
 
-            var args = $"-c credential.helper=manager fetch --progress --verbose {submod} ";
+            var args = "-c credential.helper=manager fetch --progress --verbose ";
 
             if (prune) args += "--prune ";
 
@@ -485,15 +484,14 @@ namespace SourceGit.Git {
         /// </summary>
         /// <param name="remote">remote</param>
         /// <param name="branch">branch</param>
-        /// <param name="submod">submod</param>
         /// <param name="onProgress">Progress message handler.</param>
         /// <param name="rebase">Use rebase instead of merge.</param>
         /// <param name="autostash">Auto stash local changes.</param>
         /// <param name="onProgress">Progress message handler.</param>
-        public void Pull(string remote, string branch, string submod, Action<string> onProgress, bool rebase = false, bool autostash = false) {
+        public void Pull(string remote, string branch, Action<string> onProgress, bool rebase = false, bool autostash = false) {
             isWatcherDisabled = true;
 
-            var args = $"-c credential.helper=manager pull --verbose --progress {submod} ";
+            var args = "-c credential.helper=manager pull --verbose --progress ";
             var needPopStash = false;
 
             if (rebase) args += "--rebase ";
@@ -531,15 +529,14 @@ namespace SourceGit.Git {
         /// <param name="remote">Remote</param>
         /// <param name="localBranch">Local branch name</param>
         /// <param name="remoteBranch">Remote branch name</param>
-        /// <param name="submod">submod</param>
         /// <param name="onProgress">Progress message handler.</param>
         /// <param name="withTags">Push tags</param>
         /// <param name="track">Create track reference</param>
         /// <param name="force">Force push</param>
-        public void Push(string remote, string localBranch, string remoteBranch,  string submod, Action<string> onProgress, bool withTags = false, bool track = false, bool force = false) {
+        public void Push(string remote, string localBranch, string remoteBranch, Action<string> onProgress, bool withTags = false, bool track = false, bool force = false) {
             isWatcherDisabled = true;
 
-            var args = $"-c credential.helper=manager push --progress --verbose {submod} ";
+            var args = "-c credential.helper=manager push --progress --verbose ";
 
             if (withTags) args += "--tags ";
             if (track) args += "-u ";
diff --git a/SourceGit/SourceGit.csproj b/SourceGit/SourceGit.csproj
index dbb64ca1..83255225 100644
--- a/SourceGit/SourceGit.csproj
+++ b/SourceGit/SourceGit.csproj
@@ -9,7 +9,7 @@
         <Description>OpenSource GIT client for Windows</Description>
         <Copyright>Copyright © sourcegit 2020. All rights reserved.</Copyright>
         <ApplicationManifest>App.manifest</ApplicationManifest>
-        <Version>1.4</Version>
+        <Version>2.0.0-preview</Version>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/SourceGit/UI/Fetch.xaml b/SourceGit/UI/Fetch.xaml
index 11e59594..550ed554 100644
--- a/SourceGit/UI/Fetch.xaml
+++ b/SourceGit/UI/Fetch.xaml
@@ -6,7 +6,7 @@
              xmlns:git="clr-namespace:SourceGit.Git"
              xmlns:converters="clr-namespace:SourceGit.Converters"
              mc:Ignorable="d" 
-             d:DesignHeight="192" d:DesignWidth="500" Height="224" Width="500">
+             d:DesignHeight="192" d:DesignWidth="500" Height="192" Width="500">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="32"/>
@@ -14,7 +14,6 @@
             <RowDefinition Height="32"/>
             <RowDefinition Height="32"/>
             <RowDefinition Height="32"/>
-            <RowDefinition Height="32"/>
             <RowDefinition Height="16"/>
             <RowDefinition Height="32"/>
         </Grid.RowDefinitions>
@@ -42,24 +41,17 @@
             </ComboBox.ItemTemplate>
         </ComboBox>
 
-        <Label Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right" Content="Recurse Submodules :"/>
-        <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal">
-            <RadioButton x:Name="RbtnRrsSubModYes" Content="Yes" GroupName="RecurseSubmodules"/>
-            <RadioButton x:Name="RbtnRrsSubModDemand" Content="On-Demand" Margin="8,0,0,0" GroupName="RecurseSubmodules" IsChecked="True"/>
-            <RadioButton x:Name="RbtnRrsSubModNo" Content="No" Margin="8,0,0,0" GroupName="RecurseSubmodules"/>
-        </StackPanel>
-
-        <CheckBox Grid.Row="4" Grid.Column="1"
+        <CheckBox Grid.Row="3" Grid.Column="1"
                   x:Name="chkFetchAll"
                   IsChecked="True"
                   Content="Fetch all remotes"/>
 
-        <CheckBox Grid.Row="5" Grid.Column="1"
+        <CheckBox Grid.Row="4" Grid.Column="1"
                   x:Name="chkPrune"
                   IsChecked="True"
                   Content="Prune remote dead branches"/>
 
-        <Grid Grid.Row="7" Grid.ColumnSpan="2">
+        <Grid Grid.Row="6" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="80"/>
diff --git a/SourceGit/UI/Fetch.xaml.cs b/SourceGit/UI/Fetch.xaml.cs
index 8de01ebd..843ab0cb 100644
--- a/SourceGit/UI/Fetch.xaml.cs
+++ b/SourceGit/UI/Fetch.xaml.cs
@@ -50,23 +50,14 @@ namespace SourceGit.UI {
         /// <param name="e"></param>
         private async void Start(object sender, RoutedEventArgs e) {
             bool prune = chkPrune.IsChecked == true;
-
-            string subMod;
-            if (RbtnRrsSubModYes.IsChecked == true) {
-                subMod = "--recurse-submodules=yes";
-            } else if (RbtnRrsSubModNo.IsChecked == true) {
-                subMod = "--recurse-submodules=no";
-            } else  {
-                subMod = "--recurse-submodules=on-demand";
-            }
 
             PopupManager.Lock();
 
             if (chkFetchAll.IsChecked == true) {
-                await Task.Run(() => repo.Fetch(null, subMod, prune, PopupManager.UpdateStatus));
+                await Task.Run(() => repo.Fetch(null, prune, PopupManager.UpdateStatus));
             } else {
                 var remote = combRemotes.SelectedItem as Git.Remote;
-                await Task.Run(() => repo.Fetch(remote, subMod, prune, PopupManager.UpdateStatus));
+                await Task.Run(() => repo.Fetch(remote, prune, PopupManager.UpdateStatus));
             }
 
             PopupManager.Close(true);
diff --git a/SourceGit/UI/Pull.xaml b/SourceGit/UI/Pull.xaml
index f24c67f0..57c0e072 100644
--- a/SourceGit/UI/Pull.xaml
+++ b/SourceGit/UI/Pull.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              mc:Ignorable="d" 
-             d:DesignHeight="248" d:DesignWidth="500" Height="280" Width="500">
+             d:DesignHeight="248" d:DesignWidth="500" Height="248" Width="500">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="32"/>
@@ -12,7 +12,6 @@
             <RowDefinition Height="32"/>
             <RowDefinition Height="32"/>
             <RowDefinition Height="32"/>
-            <RowDefinition Height="32"/>
             <RowDefinition Height="28"/>
             <RowDefinition Height="28"/>
             <RowDefinition Height="16"/>
@@ -61,26 +60,19 @@
             <Label x:Name="txtInto" VerticalAlignment="Center"/>
         </StackPanel>
 
-        <Label Grid.Row="5" Grid.Column="0" HorizontalAlignment="Right" Content="Recurse Submodules :"/>
-        <StackPanel Grid.Row="5" Grid.Column="1" Orientation="Horizontal">
-            <RadioButton x:Name="RbtnRrsSubModYes" Content="Yes" GroupName="RecurseSubmodules"/>
-            <RadioButton x:Name="RbtnRrsSubModDemand" Content="On-Demand" Margin="8,0,0,0" GroupName="RecurseSubmodules" IsChecked="True"/>
-            <RadioButton x:Name="RbtnRrsSubModNo" Content="No" Margin="8,0,0,0" GroupName="RecurseSubmodules"/>
-        </StackPanel>
-
-        <CheckBox Grid.Row="6" Grid.Column="1"
+        <CheckBox Grid.Row="5" Grid.Column="1"
                   x:Name="chkRebase"
                   IsChecked="True"
                   VerticalAlignment="Center"
                   Content="Use rebase instead of merge"/>
 
-        <CheckBox Grid.Row="7" Grid.Column="1"
+        <CheckBox Grid.Row="6" Grid.Column="1"
                   x:Name="chkAutoStash"
                   IsChecked="True"
                   VerticalAlignment="Center"
                   Content="Stash &amp; reapply local changes"/>
 
-        <Grid Grid.Row="9" Grid.ColumnSpan="2">
+        <Grid Grid.Row="8" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="80"/>
diff --git a/SourceGit/UI/Pull.xaml.cs b/SourceGit/UI/Pull.xaml.cs
index a23dbfbb..e88fea7d 100644
--- a/SourceGit/UI/Pull.xaml.cs
+++ b/SourceGit/UI/Pull.xaml.cs
@@ -76,17 +76,8 @@ namespace SourceGit.UI {
 
             if (remote == null || branch == null) return;
 
-            string subMod;
-            if (RbtnRrsSubModYes.IsChecked == true) {
-                subMod = "--recurse-submodules=yes";
-            } else if (RbtnRrsSubModNo.IsChecked == true) {
-                subMod = "--recurse-submodules=no";
-            } else {
-                subMod = "--recurse-submodules=on-demand";
-            }
-
             PopupManager.Lock();
-            await Task.Run(() => repo.Pull(remote, branch.Substring(branch.IndexOf('/')+1), subMod, PopupManager.UpdateStatus, rebase, autoStash));
+            await Task.Run(() => repo.Pull(remote, branch.Substring(branch.IndexOf('/')+1), PopupManager.UpdateStatus, rebase, autoStash));
             PopupManager.Close(true);
         }
 
diff --git a/SourceGit/UI/Push.xaml b/SourceGit/UI/Push.xaml
index cba7865e..b5ed0148 100644
--- a/SourceGit/UI/Push.xaml
+++ b/SourceGit/UI/Push.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:git="clr-namespace:SourceGit.Git"
              mc:Ignorable="d" 
-             d:DesignHeight="248" d:DesignWidth="500" Height="280" Width="500">
+             d:DesignHeight="248" d:DesignWidth="500" Height="248" Width="500">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="32"/>
@@ -13,7 +13,6 @@
             <RowDefinition Height="32"/>
             <RowDefinition Height="32"/>
             <RowDefinition Height="32"/>
-            <RowDefinition Height="32"/>
             <RowDefinition Height="28"/>
             <RowDefinition Height="28"/>
             <RowDefinition Height="16"/>
@@ -71,25 +70,17 @@
             </ComboBox.ItemTemplate>
         </ComboBox>
 
-        <Label Grid.Row="5" Grid.Column="0" HorizontalAlignment="Right" Content="Recurse Submodules :"/>
-        <StackPanel Grid.Row="5" Grid.Column="1" Orientation="Horizontal">
-            <RadioButton x:Name="RbtnRrsSubModCheck" Content="Check" GroupName="RecurseSubmodules"/>
-            <RadioButton x:Name="RbtnRrsSubModDemand" Content="On-Demand" Margin="8,0,0,0" GroupName="RecurseSubmodules" />
-            <RadioButton x:Name="RbtnRrsSubModOnly" Content="Only" Margin="8,0,0,0" GroupName="RecurseSubmodules"/>
-            <RadioButton x:Name="RbtnRrsSubModNo" Content="No" Margin="8,0,0,0" GroupName="RecurseSubmodules" IsChecked="True"/>
-        </StackPanel>
-
-        <CheckBox Grid.Row="6" Grid.Column="1"
+        <CheckBox Grid.Row="5" Grid.Column="1"
                   x:Name="chkTags"
                   VerticalAlignment="Center"
                   Content="Push all tags"/>
 
-        <CheckBox Grid.Row="7" Grid.Column="1"
+        <CheckBox Grid.Row="6" Grid.Column="1"
                   x:Name="chkForce"
                   VerticalAlignment="Center"
                   Content="Force push"/>
 
-        <Grid Grid.Row="9" Grid.ColumnSpan="2">
+        <Grid Grid.Row="8" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="80"/>
diff --git a/SourceGit/UI/Push.xaml.cs b/SourceGit/UI/Push.xaml.cs
index 54ab54d2..717da35a 100644
--- a/SourceGit/UI/Push.xaml.cs
+++ b/SourceGit/UI/Push.xaml.cs
@@ -53,7 +53,7 @@ namespace SourceGit.UI {
             var remoteBranch = upstream.Substring(remoteIdx + 1);
 
             Task.Run(() => {
-                repo.Push(remote, current.Name, remoteBranch, "--recurse-submodules=no", PopupManager.UpdateStatus);
+                repo.Push(remote, current.Name, remoteBranch, PopupManager.UpdateStatus);
                 push.Dispatcher.Invoke(() => {
                     PopupManager.Close(true);
                 });                
@@ -90,18 +90,6 @@ namespace SourceGit.UI {
             var track = string.IsNullOrEmpty(localBranch.Upstream);
             var tags = chkTags.IsChecked == true;
             var force = chkForce.IsChecked == true;
-
-            string subMod;
-            if (RbtnRrsSubModCheck.IsChecked == true) {
-                subMod = "--recurse-submodules=check";
-            } else if (RbtnRrsSubModDemand.IsChecked == true) {
-                subMod = "--recurse-submodules=on-demand";
-            }
-            else if (RbtnRrsSubModOnly.IsChecked == true) {
-                subMod = "--recurse-submodules=only";
-            } else{ 
-                subMod = "--recurse-submodules=no";
-            }
 
             remoteBranch = remoteBranch.Substring($"{remote}/".Length);
             if (remoteBranch.Contains(" (new)")) {
@@ -109,7 +97,7 @@ namespace SourceGit.UI {
             }
 
             PopupManager.Lock();
-            await Task.Run(() => repo.Push(remote, localBranch.Name, remoteBranch, subMod, PopupManager.UpdateStatus, tags, track, force));
+            await Task.Run(() => repo.Push(remote, localBranch.Name, remoteBranch, PopupManager.UpdateStatus, tags, track, force));
             PopupManager.Close(true);
         }