From 6b44fd44165f789af3d28eea081a398939051152 Mon Sep 17 00:00:00 2001 From: leo Date: Tue, 24 Sep 2024 18:22:18 +0800 Subject: [PATCH] code_style: remove unused codes --- src/App.axaml.cs | 2 +- src/ViewModels/Repository.cs | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/App.axaml.cs b/src/App.axaml.cs index ce47f589..a5f90e02 100644 --- a/src/App.axaml.cs +++ b/src/App.axaml.cs @@ -521,7 +521,7 @@ namespace SourceGit return false; var args = desktop.Args; - if (args.Length > 0) + if (args?.Length > 0) { desktop.MainWindow = new Views.Askpass(args[0]); return true; diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs index 9eb16c18..c5673a8b 100644 --- a/src/ViewModels/Repository.cs +++ b/src/ViewModels/Repository.cs @@ -837,24 +837,14 @@ namespace SourceGit.ViewModels var hasUnsolvedConflict = _workingCopy.SetData(changes); var inProgress = null as InProgressContext; - var rebaseMergeFolder = Path.Combine(_gitDir, "rebase-merge"); - var rebaseApplyFolder = Path.Combine(_gitDir, "rebase-apply"); if (File.Exists(Path.Combine(_gitDir, "CHERRY_PICK_HEAD"))) - { inProgress = new CherryPickInProgress(_fullpath); - } - else if (File.Exists(Path.Combine(_gitDir, "REBASE_HEAD")) && Directory.Exists(rebaseMergeFolder)) - { + else if (File.Exists(Path.Combine(_gitDir, "REBASE_HEAD")) && Directory.Exists(Path.Combine(_gitDir, "rebase-merge"))) inProgress = new RebaseInProgress(this); - } else if (File.Exists(Path.Combine(_gitDir, "REVERT_HEAD"))) - { inProgress = new RevertInProgress(_fullpath); - } else if (File.Exists(Path.Combine(_gitDir, "MERGE_HEAD"))) - { inProgress = new MergeInProgress(_fullpath); - } Dispatcher.UIThread.Invoke(() => {