fix: remove --push option because it is not valid parameter for git-flow-next (sourcegit-scm#2269)

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/Commands/GitFlow.cs

@@ -49,7 +49,7 @@ public static async Task<bool> StartAsync(string repo, Models.GitFlowBranchType
             return await start.Use(log).ExecAsync().ConfigureAwait(false);
         }
 
-        public static async Task<bool> FinishAsync(string repo, Models.GitFlowBranchType type, string name, bool squash, bool push, bool keepBranch, Models.ICommandLog log)
+        public static async Task<bool> FinishAsync(string repo, Models.GitFlowBranchType type, string name, bool squash, bool keepBranch, Models.ICommandLog log)
         {
             var builder = new StringBuilder();
             builder.Append("flow ");
@@ -73,8 +73,6 @@ public static async Task<bool> FinishAsync(string repo, Models.GitFlowBranchType
             builder.Append(" finish ");
             if (squash)
                 builder.Append("--squash ");
-            if (push)
-                builder.Append("--push ");
             if (keepBranch)
                 builder.Append("-k ");
             builder.Append(name);

src/Resources/Locales/en_US.axaml

@@ -436,7 +436,6 @@
   <x:String x:Key="Text.GitFlow.FinishHotfix" xml:space="preserve">FLOW - Finish Hotfix</x:String>
   <x:String x:Key="Text.GitFlow.FinishRelease" xml:space="preserve">FLOW - Finish Release</x:String>
   <x:String x:Key="Text.GitFlow.FinishTarget" xml:space="preserve">Target:</x:String>
-  <x:String x:Key="Text.GitFlow.FinishWithPush" xml:space="preserve">Push to remote(s) after performing finish</x:String>
   <x:String x:Key="Text.GitFlow.FinishWithSquash" xml:space="preserve">Squash during merge</x:String>
   <x:String x:Key="Text.GitFlow.Hotfix" xml:space="preserve">Hotfix:</x:String>
   <x:String x:Key="Text.GitFlow.HotfixPrefix" xml:space="preserve">Hotfix Prefix:</x:String>

src/ViewModels/GitFlowFinish.cs

@@ -21,12 +21,6 @@ public bool Squash
             set;
         } = false;
 
-        public bool AutoPush
-        {
-            get;
-            set;
-        } = false;
-
         public bool KeepBranch
         {
             get;
@@ -50,7 +44,7 @@ public override async Task<bool> Sure()
 
             var prefix = _repo.GitFlow.GetPrefix(Type);
             var name = Branch.Name.StartsWith(prefix) ? Branch.Name.Substring(prefix.Length) : Branch.Name;
-            var succ = await Commands.GitFlow.FinishAsync(_repo.FullPath, Type, name, Squash, AutoPush, KeepBranch, log);
+            var succ = await Commands.GitFlow.FinishAsync(_repo.FullPath, Type, name, Squash, KeepBranch, log);
 
             log.Complete();
             return succ;

src/Views/GitFlowFinish.axaml

@@ -27,7 +27,7 @@
                  IsVisible="{Binding Type, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:GitFlowBranchType.Hotfix}}"/>
     </StackPanel>
 
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32" ColumnDefinitions="150,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -43,11 +43,6 @@
                 ToolTip.Tip="--squash"/>
 
       <CheckBox Grid.Row="2" Grid.Column="1"
-                Content="{DynamicResource Text.GitFlow.FinishWithPush}"
-                IsChecked="{Binding AutoPush, Mode=TwoWay}"
-                ToolTip.Tip="--push"/>
-
-      <CheckBox Grid.Row="3" Grid.Column="1"
                 Content="{DynamicResource Text.GitFlow.KeepBranchAfterFinish}"
                 IsChecked="{Binding KeepBranch, Mode=TwoWay}"
                 ToolTip.Tip="-k"/>