diff --git a/src/Commands/GitFlow.cs b/src/Commands/GitFlow.cs index c2052f0e..8e29e6b5 100644 --- a/src/Commands/GitFlow.cs +++ b/src/Commands/GitFlow.cs @@ -49,7 +49,7 @@ namespace SourceGit.Commands return await start.Use(log).ExecAsync().ConfigureAwait(false); } - public static async Task FinishAsync(string repo, Models.GitFlowBranchType type, string name, bool squash, bool push, bool keepBranch, Models.ICommandLog log) + public static async Task 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 @@ namespace SourceGit.Commands builder.Append(" finish "); if (squash) builder.Append("--squash "); - if (push) - builder.Append("--push "); if (keepBranch) builder.Append("-k "); builder.Append(name); diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml index e9569bcd..07e2fcec 100644 --- a/src/Resources/Locales/en_US.axaml +++ b/src/Resources/Locales/en_US.axaml @@ -436,7 +436,6 @@ FLOW - Finish Hotfix FLOW - Finish Release Target: - Push to remote(s) after performing finish Squash during merge Hotfix: Hotfix Prefix: diff --git a/src/ViewModels/GitFlowFinish.cs b/src/ViewModels/GitFlowFinish.cs index 7ed48cbf..42cf0544 100644 --- a/src/ViewModels/GitFlowFinish.cs +++ b/src/ViewModels/GitFlowFinish.cs @@ -21,12 +21,6 @@ namespace SourceGit.ViewModels set; } = false; - public bool AutoPush - { - get; - set; - } = false; - public bool KeepBranch { get; @@ -50,7 +44,7 @@ namespace SourceGit.ViewModels 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; diff --git a/src/Views/GitFlowFinish.axaml b/src/Views/GitFlowFinish.axaml index 66097c0f..d0d8d212 100644 --- a/src/Views/GitFlowFinish.axaml +++ b/src/Views/GitFlowFinish.axaml @@ -27,7 +27,7 @@ IsVisible="{Binding Type, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:GitFlowBranchType.Hotfix}}"/> - + - -