dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-21 12:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

code_style: remove unused codes

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
Download patch file Download diff file Expand all files Collapse all files

12
src/ViewModels/Repository.cs
View file

@ -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(() =>
{