michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2025-01-11 23:57:21 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

code_style: remove unused codes
Some checks are pending
Continuous Integration / Build (push) Waiting to run
Details
Continuous Integration / Prepare version string (push) Waiting to run
Details
Continuous Integration / Package (push) Blocked by required conditions
Details

Browse source
This commit is contained in:
leo 2024-09-24 18:22:18 +08:00
parent d1d913aa45
commit 6b44fd4416
No known key found for this signature in database
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App.axaml.cs
View file

@ -521,7 +521,7 @@ namespace SourceGit
return false; return false;
var args = desktop.Args; var args = desktop.Args;
if (args.Length > 0) if (args?.Length > 0)
{ {
desktop.MainWindow = new Views.Askpass(args[0]); desktop.MainWindow = new Views.Askpass(args[0]);
return true; return true;

12
src/ViewModels/Repository.cs
View file

@ -837,24 +837,14 @@ namespace SourceGit.ViewModels
var hasUnsolvedConflict = _workingCopy.SetData(changes); var hasUnsolvedConflict = _workingCopy.SetData(changes);
var inProgress = null as InProgressContext; 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"))) if (File.Exists(Path.Combine(_gitDir, "CHERRY_PICK_HEAD")))
{
inProgress = new CherryPickInProgress(_fullpath); inProgress = new CherryPickInProgress(_fullpath);
} else if (File.Exists(Path.Combine(_gitDir, "REBASE_HEAD")) && Directory.Exists(Path.Combine(_gitDir, "rebase-merge")))
else if (File.Exists(Path.Combine(_gitDir, "REBASE_HEAD")) && Directory.Exists(rebaseMergeFolder))
{
inProgress = new RebaseInProgress(this); inProgress = new RebaseInProgress(this);
}
else if (File.Exists(Path.Combine(_gitDir, "REVERT_HEAD"))) else if (File.Exists(Path.Combine(_gitDir, "REVERT_HEAD")))
{
inProgress = new RevertInProgress(_fullpath); inProgress = new RevertInProgress(_fullpath);
}
else if (File.Exists(Path.Combine(_gitDir, "MERGE_HEAD"))) else if (File.Exists(Path.Combine(_gitDir, "MERGE_HEAD")))
{
inProgress = new MergeInProgress(_fullpath); inProgress = new MergeInProgress(_fullpath);
}
Dispatcher.UIThread.Invoke(() => Dispatcher.UIThread.Invoke(() =>
{ {